diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-03-21 17:56:11 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-03-21 17:56:11 -0400 |
| commit | 955b727550e8595fd67c55775d8f0fe249826277 (patch) | |
| tree | f4ac70eb36bcb14d44fad4199811d365eb4b788f /indra/newview/llstartup.cpp | |
| parent | 77fff26431671ffef8cf482044b1fcd98262d3e0 (diff) | |
| parent | 5b9ee2a9d5687eae6fd48ee6038cd2f7ed1d9a53 (diff) | |
merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index b98cbd5b78..87b33980d6 100755 --- 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 @@ -775,6 +773,7 @@ bool idle_startup() gViewerWindow->setNormalControlsVisible( FALSE ); gLoginMenuBarView->setVisible( TRUE ); gLoginMenuBarView->setEnabled( TRUE ); + show_debug_menus(); // Hide the splash screen LLSplashScreen::hide(); @@ -1703,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. |