diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-11-07 13:28:42 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-11-07 13:28:42 -0500 |
| commit | 0755cb098dc10897106879231989718dbf4abb26 (patch) | |
| tree | f34022002eae5a39a5d38bb5a2ade798b184bdea /indra/llcommon/llapp.cpp | |
| parent | 4091e47cf206a41cac7ee440b8fd2e2898006685 (diff) | |
| parent | bf6d1670756ba96abde570e7dbbf94c62c71ca5b (diff) | |
Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.
Two fairly simple conflicts: dead stats sending code in the
texture fetch code (new llcorehttp library) and the cleanup
code in llappviewer was moved around in 3.4.x.
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. |