DRTVWR-545 Megre fix

2 files changed, 13 insertions, 8 deletions

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 1c67cc9705..ecd62cadf8 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3982,8 +3982,11 @@ void LLAppViewer::removeDumpDir()
 {
     //Call this routine only on clean exit.  Crash reporter will clean up
     //its locking table for us.
-    std::string dump_dir = gDirUtilp->getExpandedFilename(LL_PATH_DUMP, "");
-    gDirUtilp->deleteDirAndContents(dump_dir);
+    if (gDirUtilp->dumpDirExists()) // Check if dump dir was created this run
+    {
+        std::string dump_dir = gDirUtilp->getExpandedFilename(LL_PATH_DUMP, "");
+        gDirUtilp->deleteDirAndContents(dump_dir);
+    }
 
     if (mSecondInstance && !isError())
     {
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 1896248502..0e63268107 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -118,14 +118,16 @@ namespace
     {
         if (nCode == MDSCB_EXCEPTIONCODE)
         {
-            // second instance does not have own log files
+            // send the main viewer log file, one per instance
+            // widen to wstring, convert to __wchar_t, then pass c_str()
+            sBugSplatSender->sendAdditionalFile(
+                WCSTR(LLError::logFileName()));
+
+            // second instance does not have some log files
+            // TODO: This needs fixing, if each instance now has individual logs,
+            // same should be made true for static debug files
             if (!LLAppViewer::instance()->isSecondInstance())
             {
-                // send the main viewer log file
-                // widen to wstring, convert to __wchar_t, then pass c_str()
-                sBugSplatSender->sendAdditionalFile(
-                    WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "SecondLife.log")));
-
                 sBugSplatSender->sendAdditionalFile(
                     WCSTR(*LLAppViewer::instance()->getStaticDebugFile()));
             }