History

Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo

Andrzej Kapolka committed 12 years ago

Commit 495447f2 parents 18ea1d6 d8321bd32 files · +2024 −131Browse files

Showing the changes to interface/src/Application.cpp (1 of 32 files). Show all

Unified · Split

interface/src/Application.cpp+2−2
@@ -253,7 +253,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 252 unmodified lines
253 // send the identity packet for our avatar each second to our avatar mixer253 // send the identity packet for our avatar each second to our avatar mixer
254 QTimer* identityPacketTimer = new QTimer();254 QTimer* identityPacketTimer = new QTimer();
255 connect(identityPacketTimer, &QTimer::timeout, _myAvatar, &MyAvatar::sendIdentityPacket);255 connect(identityPacketTimer, &QTimer::timeout, _myAvatar, &MyAvatar::sendIdentityPacket);
256 identityPacketTimer->start(1000);256 identityPacketTimer->start(AVATAR_IDENTITY_PACKET_SEND_INTERVAL_MSECS);
257 257
258 QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);258 QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
259 259
@@ -2347,7 +2347,7 @@ void Application::updateMyAvatar(float deltaTime) { · 2087 unmodified lines
2347 _myAvatar->update(deltaTime);2347 _myAvatar->update(deltaTime);
2348 2348
2349 // send head/hand data to the avatar mixer and voxel server2349 // send head/hand data to the avatar mixer and voxel server
2350 QByteArray packet = byteArrayWithPopluatedHeader(PacketTypeAvatarData);2350 QByteArray packet = byteArrayWithPopulatedHeader(PacketTypeAvatarData);
2351 packet.append(_myAvatar->toByteArray());2351 packet.append(_myAvatar->toByteArray());
2352 2352
2353 controlledBroadcastToNodes(packet, NodeSet() << NodeType::AvatarMixer);2353 controlledBroadcastToNodes(packet, NodeSet() << NodeType::AvatarMixer);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t