Merge branch 'atp' of github.com:birarda/hifi into receive_packets

This commit is contained in:
Ryan Huffman 2015-07-14 16:21:57 -07:00
commit c6ffda12f9

View file

@ -3941,7 +3941,7 @@ int Application::processOctreeStats(NLPacket& packet, SharedNodePointer sendingN
_octreeSceneStatsLock.lockForWrite(); _octreeSceneStatsLock.lockForWrite();
auto it = _octreeServerSceneStats.find(nodeUUID); auto it = _octreeServerSceneStats.find(nodeUUID);
if (it != _octreeServerSceneStats.end()) { if (it != _octreeServerSceneStats.end()) {
octreeStats = &it.value(); octreeStats = &it->second;
statsMessageLength = octreeStats->unpackFromPacket(packet); statsMessageLength = octreeStats->unpackFromPacket(packet);
} else { } else {
OctreeSceneStats temp; OctreeSceneStats temp;