summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2021-11-25 17:33:13 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2021-11-25 17:33:13 +0200
commitf7258b49b20cb306804db8276b1caf7d9bb75e23 (patch)
tree98d74a00726f80843e40d8e4ca0a10784913da41 /indra/newview/llappviewer.cpp
parent8852cb9cbd25df8d25fa43cf39b222ab8381ebd6 (diff)
SL-16408 Fix for crashing on disconnect
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 177558d38f..58e15c3630 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1768,6 +1768,8 @@ bool LLAppViewer::cleanup()
//ditch LLVOAvatarSelf instance
gAgentAvatarp = NULL;
+ LLViewerCamera::deleteSingleton();
+
LLNotifications::instance().clear();
// workaround for DEV-35406 crash on shutdown
@@ -5722,7 +5724,6 @@ void LLAppViewer::disconnectViewer()
LLWorld::getInstance()->destroyClass();
}
LLVOCache::deleteSingleton();
- LLViewerCamera::deleteSingleton();
// call all self-registered classes
LLDestroyClassList::instance().fireCallbacks();