diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-09-22 14:47:42 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-09-22 14:47:42 -0700 |
| commit | a01ad64c3e701de0586043aebf3229c5f5a4916a (patch) | |
| tree | bc4c83c407552b8a18d5621187c877a1abc25506 /indra/newview | |
| parent | 29596be514d361c71273629677bcb4c7052a6036 (diff) | |
replace the display_startup() removal that didn't work. Try backing up a step in the signon processing.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 60d67be9ef..b0ea00e6e4 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -752,10 +752,10 @@ bool idle_startup() // Make sure the process dialog doesn't hide things display_startup(); gViewerWindow->setShowProgress(FALSE); -// display_startup(); + display_startup(); // Show the login dialog login_show(); -// display_startup(); + display_startup(); // connect dialog is already shown, so fill in the names if (gUserCredential.notNull()) { @@ -2751,8 +2751,6 @@ void reset_login() gAgent.cleanup(); LLWorld::getInstance()->destroyClass(); - LLStartUp::setStartupState( STATE_LOGIN_SHOW ); - if ( gViewerWindow ) { // Hide menus and normal buttons gViewerWindow->setNormalControlsVisible( FALSE ); @@ -2762,6 +2760,7 @@ void reset_login() // Hide any other stuff LLFloaterReg::hideVisibleInstances(); + LLStartUp::setStartupState( STATE_BROWSER_INIT ); } //--------------------------------------------------------------------------- |