Second Life viewer sources 1.22.6-RC

1 files changed, 12 insertions, 3 deletions

diff --git a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
index 467dacf..0896814 100644
--- a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
+++ b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
@@ -124,11 +124,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;
 }