summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-09-22 23:38:23 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-09-25 13:54:06 +0300
commit3424a1f965721493b4e4c78ca83b16bb00ce6b32 (patch)
treef7b981e11fc91c61d370b365a29fbbc7c50e171b /indra/newview
parent738a651efaadb85ef4bec7a7995e9ee7b181949c (diff)
SL-13979 Crash of logging system at LLError::Settings::getInstance()
LLSingleton depends onto logging system, having logging system be based on LLSingleton causes crashes and deadlocks
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llappviewer.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index ca76ab2831..30f79de289 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2131,14 +2131,12 @@ bool LLAppViewer::cleanup()
// still see above are calls that MUST happen before the generic cleanup
// kicks in.
- // The logging subsystem depends on an LLSingleton. Any logging after
- // LLSingletonBase::deleteAll() won't be recorded.
- LL_INFOS() << "Goodbye!" << LL_ENDL;
-
// This calls every remaining LLSingleton's cleanupSingleton() and
// deleteSingleton() methods.
LLSingletonBase::deleteAll();
+ LL_INFOS() << "Goodbye!" << LL_ENDL;
+
removeDumpDir();
// return 0;