summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewermacosx.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-06-15 16:48:20 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-06-15 16:48:20 -0400
commit448e82f39c472c82620bb52e0644e258b363d562 (patch)
tree9e72eae4aa32322768d2b0cd8fc20e9f06a11370 /indra/newview/llappviewermacosx.cpp
parentf26ba0f0eccce2e6b66554dc1132ff29e6d0f3b1 (diff)
SL-821: Try to add SecondLife.log file to Mac BugSplat crash report.
Introduce new header file llappviewermacosx-for-objc.h to publish for llappdelegate-objc.mm and other Objective-C++ consumers the free functions in llappviewermacosx.cpp they consume. These were never before declared in any header file. Apparently, to date, we've been trusting to luck that Objective-C++ will infer the correct signature from calls -- and that the calls are correct with respect to the function definitions. :-P This gives us a place to introduce a new getLogFilePathname() function to query LLDir. (We don't simply #include "lldir.h" because of the pervasive use of BOOL in viewer headers; BOOL means something very different in Objective-C++.)
Diffstat (limited to 'indra/newview/llappviewermacosx.cpp')
-rw-r--r--indra/newview/llappviewermacosx.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp
index d472f8926b..cdbdb23d9a 100644
--- a/indra/newview/llappviewermacosx.cpp
+++ b/indra/newview/llappviewermacosx.cpp
@@ -36,6 +36,7 @@
#include "llappviewermacosx-objc.h"
#include "llappviewermacosx.h"
+#include "llappviewermacosx-for-objc.h"
#include "llwindowmacosx-objc.h"
#include "llcommandlineparser.h"
@@ -147,6 +148,11 @@ void cleanupViewer()
gViewerAppPtr = NULL;
}
+std::string getLogFilePathname()
+{
+ return gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "SecondLife.log");
+}
+
int main( int argc, char **argv )
{
// Store off the command line args for use later.