Merge branch 'master' v6.5.1 into DRTVWR-528

1 files changed, 2 insertions, 0 deletions

diff --git a/indra/newview/llappviewermacosx-for-objc.h b/indra/newview/llappviewermacosx-for-objc.h
index 79c3efff91..94bfa2491b 100644
--- a/indra/newview/llappviewermacosx-for-objc.h
+++ b/indra/newview/llappviewermacosx-for-objc.h
@@ -31,6 +31,7 @@ bool pumpMainLoop();
 void handleQuit();
 void cleanupViewer();
 void infos(const std::string& message);
+void clearDumpLogsDir();
 
 // This struct is malleable; it only serves as a way to convey a number of
 // fields from llappviewermacosx.cpp's CrashMetadata_instance() function to the
@@ -47,6 +48,7 @@ struct CrashMetadata
     std::string agentFullname;
     std::string regionName;
     std::string fatalMessage;
+    std::string secondLogFilePathname;
 };
 
 CrashMetadata& CrashMetadata_instance();