diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-05 13:39:26 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-05 13:39:26 -0500 |
| commit | 41ab7853536dcbbf2b64d06b754617ee6bc7e896 (patch) | |
| tree | 49d3e429f9bcdab55a750d1e6bbf0b88c517ddb8 /indra/newview/llstartup.cpp | |
| parent | 663aa828312413a391a2d848f6bb1b9aae92a543 (diff) | |
| parent | 3856dcbbf36e0c8d1d278e9a7603a151580ccff1 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index a402dfc3d1..37c8d94d5e 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -773,6 +773,8 @@ bool idle_startup() LLPanelLogin::giveFocus(); + gSavedSettings.setBOOL("FirstRunThisInstall", FALSE); + LLStartUp::setStartupState( STATE_LOGIN_WAIT ); // Wait for user input } else @@ -1698,6 +1700,10 @@ bool idle_startup() << " kbps" << LL_ENDL; gViewerThrottle.setMaxBandwidth(FAST_RATE_BPS / 1024.f); } + + // Set the show start location to true, now that the user has logged + // on with this install. + gSavedSettings.setBOOL("ShowStartLocation", TRUE); } // We're successfully logged in. @@ -2006,9 +2012,6 @@ bool idle_startup() LLStartUp::setStartupState( STATE_STARTED ); - // Mark that we have successfully logged in at least once - gSavedSettings.setBOOL("HadFirstSuccessfulLogin", TRUE); - // Unmute audio if desired and setup volumes. // Unmute audio if desired and setup volumes. // This is a not-uncommon crash site, so surround it with |