From 46f8fb8781ccce338b4a88aaf8371ee3dec56d29 Mon Sep 17 00:00:00 2001
From: Mark Palange <palange@lindenlab.com>
Date: Tue, 3 Feb 2009 21:15:57 +0000
Subject: 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

---
 indra/linux_crash_logger/llcrashloggerlinux.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'indra/linux_crash_logger')

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;
 }
 
-- 
cgit v1.2.3