Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 15:30:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve final conflict in Application

Browse source
This commit is contained in:
Stephen Birarda 2015-07-15 16:23:23 -07:00
parent 05dde9d8f5
commit 6a02e6d001
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -3955,9 +3955,6 @@ int Application::processOctreeStats(NLPacket& packet, SharedNodePointer sendingN
} else {
jurisdiction->unlock();
}
} else {
jurisdiction->unlock();
}
// store jurisdiction details for later use
// This is bit of fiddling is because JurisdictionMap assumes it is the owner of the values used to construct it
// but OctreeSceneStats thinks it's just returning a reference to its contents. So we need to make a copy of the