From 39a59fe5f45e5d289fb1d7fb36442dbd057d6513 Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Sun, 8 Jul 2012 23:51:41 -0700
Subject: [PATCH] FIRE-6914: corrected issue regarding crash report behavor,
 set default to always ask

---
 indra/llcrashlogger/llcrashlogger.cpp                  | 4 ++--
 indra/newview/app_settings/settings_crash_behavior.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index 957c8f59ec..8b4001cc71 100644
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -580,8 +580,8 @@ bool LLCrashLogger::init()
 							  "1 = always send crash report, "
 							  "2 = never send crash report)");
 
-	// llinfos << "Loading crash behavior setting" << llendl;
-	// mCrashBehavior = loadCrashBehaviorSetting();
+	llinfos << "Loading crash behavior setting" << llendl;
+	mCrashBehavior = loadCrashBehaviorSetting();
 
 	// If user doesn't want to send, bail out
 	if (mCrashBehavior == CRASH_BEHAVIOR_NEVER_SEND)
diff --git a/indra/newview/app_settings/settings_crash_behavior.xml b/indra/newview/app_settings/settings_crash_behavior.xml
index c39b55ca3e..73e21334a2 100644
--- a/indra/newview/app_settings/settings_crash_behavior.xml
+++ b/indra/newview/app_settings/settings_crash_behavior.xml
@@ -9,7 +9,7 @@
         <key>Type</key>
             <string>S32</string>
         <key>Value</key>
-            <integer>1</integer>
+            <integer>0</integer>
         </map>
     <key>CrashSubmitName</key>
         <map>