diff options
| author | Mark Palange <palange@lindenlab.com> | 2009-02-03 21:15:57 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2009-02-03 21:15:57 +0000 |
| commit | 46f8fb8781ccce338b4a88aaf8371ee3dec56d29 (patch) | |
| tree | b2dc09521a166d2181c48f4a4f1ca90b83b99477 /indra/linux_crash_logger | |
| parent | e188badaf29a1a02307f93864eed6737096bd9a1 (diff) | |
svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22
Merge back of viewer 1.22 RC6 and RC7 change to trunk.
QAR-1214 and QAR-1227
Diffstat (limited to 'indra/linux_crash_logger')
| -rw-r--r-- | indra/linux_crash_logger/llcrashloggerlinux.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/indra/linux_crash_logger/llcrashloggerlinux.cpp b/indra/linux_crash_logger/llcrashloggerlinux.cpp index bd06928598..2c46a24b65 100644 --- a/indra/linux_crash_logger/llcrashloggerlinux.cpp +++ b/indra/linux_crash_logger/llcrashloggerlinux.cpp @@ -125,11 +125,20 @@ void LLCrashLoggerLinux::gatherPlatformSpecificFiles() bool LLCrashLoggerLinux::mainLoop() { - if(!do_ask_dialog()) + bool send_logs = true; + if(CRASH_BEHAVIOR_ASK == getCrashBehavior()) { - return true; + send_logs = do_ask_dialog(); + } + else if(CRASH_BEHAVIOR_NEVER_SEND == getCrashBehavior()) + { + send_logs = false; + } + + if(send_logs) + { + sendCrashLogs(); } - sendCrashLogs(); return true; } |