Merge remote-tracking branch 'origin/develop-linux' into geenz/linux-to-develop

1 files changed, 6 insertions, 4 deletions

diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm
index d3aac5a43e..017d5c80f3 100644
--- a/indra/newview/llappdelegate-objc.mm
+++ b/indra/newview/llappdelegate-objc.mm
@@ -26,7 +26,7 @@
 
 #import "llappdelegate-objc.h"
 #if defined(LL_BUGSPLAT)
-#include <boost/filesystem.hpp>
+#include <filesystem>
 #include <vector>
 @import CrashReporter;
 @import HockeySDK;
@@ -39,6 +39,8 @@
 #include "llappviewermacosx-for-objc.h"
 #include <Carbon/Carbon.h> // Used for Text Input Services ("Safe" API - it's supported)
 
+#include "llversioninfovars.h"
+
 @implementation LLAppDelegate
 
 @synthesize window;
@@ -250,7 +252,7 @@
 
     if(!secondLogPath.empty())
     {
-        boost::filesystem::remove(secondLogPath);
+        std::filesystem::remove(secondLogPath);
     }
     clearDumpLogsDir();
 }
@@ -324,7 +326,7 @@ struct AttachmentInfo
 {
     AttachmentInfo(const std::string& path, const std::string& type):
         pathname(path),
-        basename(boost::filesystem::path(path).filename().string()),
+        basename(std::filesystem::path(path).filename().string()),
         mimetype(type)
     {}
 
@@ -359,7 +361,7 @@ struct AttachmentInfo
     // the log data to a browser, so take this opportunity to rename the file
     // from <base>.crash to <base>_log.txt
     info[0].basename =
-        boost::filesystem::path(info[0].pathname).stem().string() + "_log.txt";
+        std::filesystem::path(info[0].pathname).stem().string() + "_log.txt";
     infos("attachmentsForBugsplatStartupManager attaching log " + info[0].basename);
 
     NSMutableArray *attachments = [[NSMutableArray alloc] init];