diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:19:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:19:24 -0400 |
| commit | 9c0757511ec4ed12b47c6d3fd2ef20fca6828a6e (patch) | |
| tree | f1e08f8c3ade8afc4c83a1574c0d54ac6c224ed1 /indra/newview/llstartup.cpp | |
| parent | 32012f9fd4e9a5cb37f3a91d79873b79b9e6531e (diff) | |
| parent | 6faf2f8ee101162fdb1fe5959204055c9885968f (diff) | |
merge changes for storm-1077
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index f8f9f3ab86..8fccb35886 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -749,8 +749,6 @@ bool idle_startup() } LLPanelLogin::giveFocus(); - gSavedSettings.setBOOL("FirstRunThisInstall", FALSE); - LLStartUp::setStartupState( STATE_LOGIN_WAIT ); // Wait for user input } else @@ -1704,9 +1702,6 @@ bool idle_startup() // Set the show start location to true, now that the user has logged // on with this install. gSavedSettings.setBOOL("ShowStartLocation", TRUE); - - LLSideTray::getInstance()->showPanel("panel_home", LLSD()); - } // We're successfully logged in. |