diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-10-04 20:12:51 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-10-04 20:12:51 -0400 |
| commit | 07899b2820599600fac889355c1742c81d69d051 (patch) | |
| tree | d6166632b77cf4428cbfbf0016c15a85ff87e515 /indra/llcommon/llapp.cpp | |
| parent | 7fe8e87d19f4940d9b682faa7e189d1b1ac18785 (diff) | |
| parent | a5e28651f539ff0f9bb9a678538d70b5fa9f97ba (diff) | |
merge changes for DRTVWR-222
Diffstat (limited to 'indra/llcommon/llapp.cpp')
| -rw-r--r-- | indra/llcommon/llapp.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index ed192a9975..ca258900c7 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -289,6 +289,7 @@ void LLApp::setupErrorHandling() // occasionally checks to see if the app is in an error state, and sees if it needs to be run. #if LL_WINDOWS +#if LL_SEND_CRASH_REPORTS // This sets a callback to handle w32 signals to the console window. // The viewer shouldn't be affected, sicne its a windowed app. SetConsoleCtrlHandler( (PHANDLER_ROUTINE) ConsoleCtrlHandler, TRUE); @@ -300,7 +301,7 @@ void LLApp::setupErrorHandling() mExceptionHandler = new google_breakpad::ExceptionHandler( L"C:\\Temp\\", 0, windows_post_minidump_callback, 0, google_breakpad::ExceptionHandler::HANDLER_ALL); } - +#endif #else // // Start up signal handling. |