From 74711a2cf263a131799bd29f566c6929377617d3 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 26 May 2021 14:57:31 +0300
Subject: SL-15196 Attach correct log file to Bugsplat report

---
 indra/newview/llappdelegate-objc.mm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'indra/newview/llappdelegate-objc.mm')

diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm
index 3f1b5139c5..8063d7fda3 100644
--- a/indra/newview/llappdelegate-objc.mm
+++ b/indra/newview/llappdelegate-objc.mm
@@ -299,6 +299,12 @@ struct AttachmentInfo
         AttachmentInfo(metadata.staticDebugPathname,  "text/xml")
     };
 
+    secondLogPath = metadata.secondLogFilePathname;
+    if(!secondLogPath.empty())
+    {
+        info.push_back(AttachmentInfo(secondLogPath,  "text/xml"));
+    }
+
     // We "happen to know" that info[0].basename is "SecondLife.old" -- due to
     // the fact that BugsplatMac only notices a crash during the viewer run
     // following the crash. Replace .old with .log to reduce confusion.
@@ -333,6 +339,12 @@ struct AttachmentInfo
 - (void)bugsplatStartupManagerDidFinishSendingCrashReport:(BugsplatStartupManager *)bugsplatStartupManager
 {
     infos("Sent crash report to BugSplat");
+
+    if(!secondLogPath.empty())
+    {
+        boost::filesystem::remove(secondLogPath);
+    }
+    clearDumpLogsDir();
 }
 
 - (void)bugsplatStartupManager:(BugsplatStartupManager *)bugsplatStartupManager didFailWithError:(NSError *)error
-- 
cgit v1.2.3