diff options
author | Oz Linden <oz@lindenlab.com> | 2019-12-16 17:09:42 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2019-12-16 17:09:42 -0500 |
commit | 5056ba6daafce402a5db6d2b75dceb20ed452e1d (patch) | |
tree | 1947a04f2854fb0a4549d6988e0b6014cac3c6a2 /indra/newview | |
parent | 675842a2d4680e5e3bbbfba3db6fc183362083ea (diff) |
remove unused exception handler
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llappviewermacosx.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp index 5a0fe6ba0c..784a104573 100644 --- a/indra/newview/llappviewermacosx.cpp +++ b/indra/newview/llappviewermacosx.cpp @@ -68,25 +68,9 @@ namespace int gArgC; char** gArgV; LLAppViewerMacOSX* gViewerAppPtr = NULL; - - void (*gOldTerminateHandler)() = NULL; std::string gHandleSLURL; } -static void exceptionTerminateHandler() -{ - // reinstall default terminate() handler in case we re-terminate. - if (gOldTerminateHandler) std::set_terminate(gOldTerminateHandler); - // treat this like a regular viewer crash, with nice stacktrace etc. - long *null_ptr; - null_ptr = 0; - *null_ptr = 0xDEADBEEF; //Force an exception that will trigger breakpad. - LLAppViewer::handleViewerCrash(); - - // we've probably been killed-off before now, but... - gOldTerminateHandler(); // call old terminate() handler -} - void constructViewer() { // Set the working dir to <bundle>/Contents/Resources @@ -99,9 +83,6 @@ void constructViewer() gViewerAppPtr = new LLAppViewerMacOSX(); - // install unexpected exception handler - //gOldTerminateHandler = std::set_terminate(exceptionTerminateHandler); - gViewerAppPtr->setErrorHandler(LLAppViewer::handleViewerCrash); } |