diff options
author | Lynx Linden <lynx@lindenlab.com> | 2010-02-04 00:33:13 +0000 |
---|---|---|
committer | Lynx Linden <lynx@lindenlab.com> | 2010-02-04 00:33:13 +0000 |
commit | 2d9a08b5d1e74907ecd6df617e1be0c94cdd254d (patch) | |
tree | 7e8a1629c13cc8f179545c85993e723470f6cc33 /indra/newview/llstartup.cpp | |
parent | 6259214fac607200c26b421fc29bc37fbb7beca1 (diff) | |
parent | fe5dc0351c810ba3c13d7c0c81adf910451e2293 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r-- | indra/newview/llstartup.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index b5cd5b73ce..9fda77fe74 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -773,8 +773,6 @@ bool idle_startup() LLPanelLogin::giveFocus(); - gSavedSettings.setBOOL("FirstRunThisInstall", FALSE); - LLStartUp::setStartupState( STATE_LOGIN_WAIT ); // Wait for user input } else @@ -1997,6 +1995,9 @@ 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 |