History

Merge branch 'master' of https://github.com/worklist/hifi into glow

Andrzej Kapolka committed 13 years ago

Commit 581b6092 parents 01cd0d2 0bd54842 files · +5 −1Browse files

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

Unified · Split

interface/src/Application.cpp+4−0
@@ -4077,11 +4077,13 @@ void* Application::processVoxels(void* args) { · 4076 unmodified lines
4077 app->_wantToKillLocalVoxels = false;4077 app->_wantToKillLocalVoxels = false;
4078 }4078 }
4079 4079
4080 app->_voxelPacketMutex.lock();
4080 while (app->_voxelPackets.size() > 0) {4081 while (app->_voxelPackets.size() > 0) {
4081 NetworkPacket& packet = app->_voxelPackets.front();4082 NetworkPacket& packet = app->_voxelPackets.front();
4082 app->processVoxelPacket(packet.getSenderAddress(), packet.getData(), packet.getLength());4083 app->processVoxelPacket(packet.getSenderAddress(), packet.getData(), packet.getLength());
4083 app->_voxelPackets.erase(app->_voxelPackets.begin());4084 app->_voxelPackets.erase(app->_voxelPackets.begin());
4084 }4085 }
4086 app->_voxelPacketMutex.unlock();
4085 4087
4086 if (!app->_enableProcessVoxelsThread) {4088 if (!app->_enableProcessVoxelsThread) {
4087 break;4089 break;
@@ -4095,7 +4097,9 @@ void* Application::processVoxels(void* args) { · 7 unmodified lines
4095}4097}
4096 4098
4097void Application::queueVoxelPacket(sockaddr& senderAddress, unsigned char* packetData, ssize_t packetLength) {4099void Application::queueVoxelPacket(sockaddr& senderAddress, unsigned char* packetData, ssize_t packetLength) {
4100 _voxelPacketMutex.lock();
4098 _voxelPackets.push_back(NetworkPacket(senderAddress, packetData, packetLength));4101 _voxelPackets.push_back(NetworkPacket(senderAddress, packetData, packetLength));
4102 _voxelPacketMutex.unlock();
4099}4103}
4100 4104
4101void Application::processVoxelPacket(sockaddr& senderAddress, unsigned char* packetData, ssize_t packetLength) {4105void Application::processVoxelPacket(sockaddr& senderAddress, unsigned char* packetData, ssize_t packetLength) {

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