summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-01-11 20:40:47 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-01-11 20:43:02 +0200
commit663e45c7eade823e4eb88195057333cbd37e0b00 (patch)
tree7a53b6dbaa53d63de8d197354d3085003fafa10d /indra/newview/llappviewer.cpp
parentb3f0b0d955c7141a0cbe6852eeae36ba4b2eaa89 (diff)
SL-1028 Bugsplat based windows viewers should not overwrite log files from main instance
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 2002e3c65f..ac0b05c1c6 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3066,6 +3066,15 @@ bool LLAppViewer::initWindow()
void LLAppViewer::writeDebugInfo(bool isStatic)
{
+#if LL_WINDOWS && LL_BUGSPLAT
+ // bugsplat does not create dump folder and debug logs are written directly
+ // to logs folder, so it conflicts with main instance
+ if (mSecondInstance)
+ {
+ return;
+ }
+#endif
+
//Try to do the minimum when writing data during a crash.
std::string* debug_filename;
debug_filename = ( isStatic