summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2021-01-27 18:32:41 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2021-01-27 18:32:41 +0200
commit9fc3014435aac812754f0d47b53c87526513113e (patch)
tree41977264f544a8f7412424babb1c56adf57cf2cd /indra/newview/llappviewer.cpp
parenta3d31ca683eb0744563b36d6432168fde6ae77d9 (diff)
SL-14422 Crash at LLSceneMonitor::dumpToFile
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 0596df4ddb..0a6906febc 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1678,7 +1678,11 @@ bool LLAppViewer::cleanup()
//dump scene loading monitor results
if (LLSceneMonitor::instanceExists())
{
- LLSceneMonitor::instance().dumpToFile(gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "scene_monitor_results.csv"));
+ if (!isSecondInstance())
+ {
+ LLSceneMonitor::instance().dumpToFile(gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "scene_monitor_results.csv"));
+ }
+ LLSceneMonitor::deleteSingleton();
}
// There used to be an 'if (LLFastTimerView::sAnalyzePerformance)' block