Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 01:17:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix entity tree reset / add OST assert for myServer

Browse source
This commit is contained in:
Stephen Birarda 2015-05-08 11:04:22 -07:00
parent be58347aec
commit fe1b8cc52b
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/Agent.cpp
View file

@ -224,5 +224,9 @@ void Agent::run() {
void Agent::aboutToFinish() { void Agent::aboutToFinish() {
_scriptEngine.stop(); _scriptEngine.stop();
// our entity tree is going to go away so tell that to the EntityScriptingInterface
DependencyManager::get<EntityScriptingInterface>()->setEntityTree(NULL);
NetworkAccessManager::getInstance().clearAccessCache(); NetworkAccessManager::getInstance().clearAccessCache();
} }

3
assignment-client/src/octree/OctreeSendThread.cpp
View file

@ -68,6 +68,9 @@ bool OctreeSendThread::process() {
quint64 start = usecTimestampNow(); quint64 start = usecTimestampNow();
// we'd better have a server at this point, or we're in trouble
assert(_myServer);
// don't do any send processing until the initial load of the octree is complete... // don't do any send processing until the initial load of the octree is complete...
if (_myServer->isInitialLoadComplete()) { if (_myServer->isInitialLoadComplete()) {
if (_node) { if (_node) {