diff options
| author | Eric Tulla <tulla@lindenlab.com> | 2008-05-14 21:37:13 +0000 |
|---|---|---|
| committer | Eric Tulla <tulla@lindenlab.com> | 2008-05-14 21:37:13 +0000 |
| commit | e77de5d685ae441f72920f0e04d9887ee958745a (patch) | |
| tree | b3736831042b20be198dc9994ba68db1e8be2a14 /indra/newview/llappviewermacosx.cpp | |
| parent | 41e1ed5b4153019b07d97f54751db53fa248d8d4 (diff) | |
Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .
Passed QA as part of QAR-491.
Diffstat (limited to 'indra/newview/llappviewermacosx.cpp')
| -rw-r--r-- | indra/newview/llappviewermacosx.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp index 28314cb0ae..f21bdc4243 100644 --- a/indra/newview/llappviewermacosx.cpp +++ b/indra/newview/llappviewermacosx.cpp @@ -47,7 +47,7 @@ #include "llfloaterworldmap.h" #include "llurldispatcher.h" #include <Carbon/Carbon.h> - +#include "lldir.h" namespace { // The command line args stored. @@ -197,12 +197,13 @@ void LLAppViewerMacOSX::handleCrashReporting() { // Macintosh LLString command_str; - command_str = "open crashreporter.app"; + command_str += "open crashreporter.app"; + + clear_signals(); + llinfos << "Launching crash reporter using: '" << command_str << "'" << llendl; system(command_str.c_str()); /* Flawfinder: ignore */ - - // Sometimes signals don't seem to quit the viewer. - // Make sure we exit so as to not totally confuse the user. - exit(1); + llinfos << "returned from crash reporter... dying" << llendl; + _exit(1); } std::string LLAppViewerMacOSX::generateSerialNumber() |