1 files changed, 13 insertions, 4 deletions

diff --git a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
index c4294d6..4ccbe9a 100644
--- a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
+++ b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -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;
 }