diff options
Diffstat (limited to 'linden/indra/newview/llappviewermacosx.cpp')
-rw-r--r-- | linden/indra/newview/llappviewermacosx.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/linden/indra/newview/llappviewermacosx.cpp b/linden/indra/newview/llappviewermacosx.cpp index c128634..96b6b24 100644 --- a/linden/indra/newview/llappviewermacosx.cpp +++ b/linden/indra/newview/llappviewermacosx.cpp | |||
@@ -47,7 +47,7 @@ | |||
47 | #include "llfloaterworldmap.h" | 47 | #include "llfloaterworldmap.h" |
48 | #include "llurldispatcher.h" | 48 | #include "llurldispatcher.h" |
49 | #include <Carbon/Carbon.h> | 49 | #include <Carbon/Carbon.h> |
50 | 50 | #include "lldir.h" | |
51 | namespace | 51 | namespace |
52 | { | 52 | { |
53 | // The command line args stored. | 53 | // The command line args stored. |
@@ -197,12 +197,13 @@ void LLAppViewerMacOSX::handleCrashReporting() | |||
197 | { | 197 | { |
198 | // Macintosh | 198 | // Macintosh |
199 | LLString command_str; | 199 | LLString command_str; |
200 | command_str = "open crashreporter.app"; | 200 | command_str += "open crashreporter.app"; |
201 | |||
202 | clear_signals(); | ||
203 | llinfos << "Launching crash reporter using: '" << command_str << "'" << llendl; | ||
201 | system(command_str.c_str()); /* Flawfinder: ignore */ | 204 | system(command_str.c_str()); /* Flawfinder: ignore */ |
202 | 205 | llinfos << "returned from crash reporter... dying" << llendl; | |
203 | // Sometimes signals don't seem to quit the viewer. | 206 | _exit(1); |
204 | // Make sure we exit so as to not totally confuse the user. | ||
205 | exit(1); | ||
206 | } | 207 | } |
207 | 208 | ||
208 | std::string LLAppViewerMacOSX::generateSerialNumber() | 209 | std::string LLAppViewerMacOSX::generateSerialNumber() |