diff options
author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-11-29 17:52:11 +0200 |
---|---|---|
committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-11-29 17:52:11 +0200 |
commit | 5641f9612cfadaac697a54a4c80b4bb08815bc5b (patch) | |
tree | cecc6026965f1bd76341e4f1a2a82774299b6b58 /indra | |
parent | f7258b49b20cb306804db8276b1caf7d9bb75e23 (diff) |
SL-16408 fixed regression - crash on exit
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 58e15c3630..13670b7f13 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1768,9 +1768,7 @@ bool LLAppViewer::cleanup() //ditch LLVOAvatarSelf instance gAgentAvatarp = NULL; - LLViewerCamera::deleteSingleton(); - - LLNotifications::instance().clear(); + LLNotifications::instance().clear(); // workaround for DEV-35406 crash on shutdown LLEventPumps::instance().reset(); @@ -1811,6 +1809,7 @@ bool LLAppViewer::cleanup() LLPluginProcessParent::shutdown(); disconnectViewer(); + LLViewerCamera::deleteSingleton(); LL_INFOS() << "Viewer disconnected" << LL_ENDL; |