From 2961fea6933621fc7c8ebc692d4c517d4aa93096 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 8 Oct 2019 10:15:19 -0400
Subject: [PATCH] Rename uploaded log file to get Bugsplat to server as
 text/plain

---
 indra/newview/llappdelegate-objc.mm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm
index 30bfe1f4390..ccab9173a93 100644
--- a/indra/newview/llappdelegate-objc.mm
+++ b/indra/newview/llappdelegate-objc.mm
@@ -301,9 +301,13 @@ struct AttachmentInfo
 
     // 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.
+    // following the crash. 
+    // The Bugsplat service doesn't respect the MIME type above when returning
+    // the log data to a browser, so take this opportunity to rename the file
+    // from <base>.old to <base>_log.txt
     info[0].basename = 
-        boost::filesystem::path(info[0].pathname).stem().string() + ".log";
+        boost::filesystem::path(info[0].pathname).stem().string() + "_log.txt";
+    infos("attachmentsForBugsplatStartupManager attaching log " + info[0].basename);
 
     NSMutableArray *attachments = [[NSMutableArray alloc] init];
 
-- 
GitLab