mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 21:57:00 +02:00
fix entity tree reset / add OST assert for myServer
This commit is contained in:
parent
be58347aec
commit
fe1b8cc52b
2 changed files with 7 additions and 0 deletions
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
|
@ -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) {
|
||||||
|
|
Loading…
Reference in a new issue