Second Life viewer sources 1.18.6.4-RC

1 files changed, 3 insertions, 5 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 6cb6c55..98f1658 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2007, Linden Research, Inc.
+ * Copyright (c) 2004-2008, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -777,9 +777,6 @@ BOOL idle_startup()
                         gSavedSettings.setString("FirstName", firstname);
                         gSavedSettings.setString("LastName", lastname);
 
-
-                        
-
                         llinfos << "Attempting login as: " << firstname << " " << lastname << llendl;
                         gDebugInfo["LoginName"] = firstname + " " + lastname;   
                 }
@@ -899,7 +896,7 @@ BOOL idle_startup()
         if(STATE_LOGIN_AUTH_INIT == LLStartUp::getStartupState())
         {
 //#define LL_MINIMIAL_REQUESTED_OPTIONS
-                gDebugInfo["GridUtilHost"] = gGridInfo[gGridChoice].mName;
+                gDebugInfo["GridName"] = gGridInfo[gGridChoice].mLabel;
 
                 lldebugs << "STATE_LOGIN_AUTH_INIT" << llendl;
                 if (!gUserAuthp)
@@ -1480,6 +1477,7 @@ BOOL idle_startup()
 
                 // Finish agent initialization.  (Requires gSavedSettings, builds camera)
                 gAgent.init();
+                set_underclothes_menu_options();
 
                 // Since we connected, save off the settings so the user doesn't have to
                 // type the name/password again if we crash.