diff options
| author | Oz Linden <oz@lindenlab.com> | 2019-09-25 12:59:20 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2019-09-25 12:59:20 -0400 |
| commit | a45ca18ff8160bc3edc584d6516ca019dd6c6275 (patch) | |
| tree | 1ffe0859a42d7df0120dfe6f47feb924ee5eb549 /indra/llcommon/llapp.cpp | |
| parent | 66970f2a8c048647242887eb3f0c7fd974a303ac (diff) | |
when using bugsplat, do not catch SIGABRT; also, fix signal setting in Mac (broken macro)
Diffstat (limited to 'indra/llcommon/llapp.cpp')
| -rw-r--r-- | indra/llcommon/llapp.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index 34c969437b..27960371f1 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -779,7 +779,9 @@ void setup_signals() act.sa_flags = SA_SIGINFO; // Synchronous signals +# ifndef LL_BUGSPLAT sigaction(SIGABRT, &act, NULL); +# endif sigaction(SIGALRM, &act, NULL); sigaction(SIGBUS, &act, NULL); sigaction(SIGFPE, &act, NULL); @@ -816,7 +818,9 @@ void clear_signals() act.sa_flags = SA_SIGINFO; // Synchronous signals +# ifndef LL_BUGSPLAT sigaction(SIGABRT, &act, NULL); +# endif sigaction(SIGALRM, &act, NULL); sigaction(SIGBUS, &act, NULL); sigaction(SIGFPE, &act, NULL); @@ -869,6 +873,7 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *) return; case SIGABRT: + // Note that this handler is not set for SIGABRT when using Bugsplat // Abort just results in termination of the app, no funky error handling. if (LLApp::sLogInSignal) { |