diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-01-12 00:43:42 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-01-12 00:43:42 +0000 |
| commit | e7a8acadc46c4466f088dfca05c15f854321d69d (patch) | |
| tree | 3324f1cca426e58f4d5b9ce7c45c043c17f7050e /indra/newview/llstartup.cpp | |
| parent | dc2684fa1de8f85fe2e7f4cb9a11dc36efdc4e79 (diff) | |
svn merge -r76807:77355 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Pick up fixes made to 1.18.6 Viewer, including:
* DEV-8584 Replace "Second Life" with Channel name in viewer crash log reports
* DEV-8384 Connect button doesn't enable
* DEV-8408 Unable to edit First/last name and password fields in viewer login
* DEV-8423 VWR-3948: Underlayers no longer removable by pie menu in Windlight, release candidates
* DEV-8557 Crash on login page when using Logitech LCD Keyboard
* DEV-8507 Crash reporter has no default server to send to when crashing before agent connect
* DEV-8531 viewer_manifest.py broken for 64-bit builds
* DEV-8286 German Translation of the "Release Keys" tab is incorrect
* DEV-7419 Unable to set 'Group Access' for land that is also 'Public Access' (Was VWR-3667)
* DEV-6851 Integrate html error page with client
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 96af7d2bd2..675a447dc4 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -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) @@ -1486,6 +1483,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. |