diff options
| author | callum_linden <none@none> | 2016-05-06 13:41:46 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-06 13:41:46 -0700 |
| commit | 94a8c1138918cbd4a5b4ee634389265da335f1b2 (patch) | |
| tree | 92ade9389eb7229ae1d7ab92e1cb0f5870bd7021 /indra/mac_crash_logger/llcrashloggermac.cpp | |
| parent | c5d6bfe8ae61e3311c260626b590586d3cde4b6e (diff) | |
| parent | 7f5e6cea124e1193b199a3eabd50bdab96340c13 (diff) | |
Merge with https://bitbucket.org/oz_linden/maint-5974 to pick up a variety of fixes
Diffstat (limited to 'indra/mac_crash_logger/llcrashloggermac.cpp')
| -rwxr-xr-x | indra/mac_crash_logger/llcrashloggermac.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/mac_crash_logger/llcrashloggermac.cpp b/indra/mac_crash_logger/llcrashloggermac.cpp index 351009814d..3149fad6e8 100755 --- a/indra/mac_crash_logger/llcrashloggermac.cpp +++ b/indra/mac_crash_logger/llcrashloggermac.cpp @@ -66,22 +66,19 @@ void LLCrashLoggerMac::gatherPlatformSpecificFiles() bool LLCrashLoggerMac::mainLoop() { + if (mCrashBehavior == CRASH_BEHAVIOR_ALWAYS_SEND) { gSendReport = true; } - if(gRememberChoice) - { - if(gSendReport) saveCrashBehaviorSetting(CRASH_BEHAVIOR_ALWAYS_SEND); - else saveCrashBehaviorSetting(CRASH_BEHAVIOR_NEVER_SEND); - } - if(gSendReport) { setUserText(gUserNotes); sendCrashLogs(); } + + LL_INFOS() << "Sending of logs complete" << LL_ENDL; return true; } |