Second Life viewer sources 1.19.0.2

1 files changed, 2 insertions, 14 deletions

diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp
index 3823abf..8b1fffa 100755
--- a/linden/indra/llcrashlogger/llcrashlogger.cpp
+++ b/linden/indra/llcrashlogger/llcrashlogger.cpp
@@ -204,8 +204,7 @@ S32 LLCrashLogger::loadCrashBehaviorSetting()
 
 bool LLCrashLogger::saveCrashBehaviorSetting(S32 crash_behavior)
 {
-        if (crash_behavior < CRASH_BEHAVIOR_ASK) return false;
-        if (crash_behavior > CRASH_BEHAVIOR_NEVER_SEND) return false;
+        if (crash_behavior != CRASH_BEHAVIOR_ASK && crash_behavior != CRASH_BEHAVIOR_ALWAYS_SEND) return false;
 
         mCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, crash_behavior);
         std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
@@ -288,18 +287,7 @@ bool LLCrashLogger::init()
                 llinfos << "Show the user dialog" << llendl;
                 mCrashBehavior = CRASH_BEHAVIOR_ASK;
         }
-
-        LLSD server = getOption("user");
-        if(server.isDefined())
-        {
-                mGridName = server.asString();
-                llinfos << "Got userserver " << mGridName << llendl;
-        }
-        else
-        {
-                mGridName = "agni";
-        }
-
+        
         LLSD name = getOption("name");
         if(name.isDefined())
         {