diff options
| author | Aura Linden <aura@lindenlab.com> | 2011-07-21 17:07:57 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2011-07-21 17:07:57 -0700 |
| commit | 74b6f5dce31b5ff69ced8e1e8cd37e4c5ded2943 (patch) | |
| tree | 5242c2011c3425ef624c3f6ce59f1ce12930edae /indra/newview/llstartup.cpp | |
| parent | 6d789f59f8d8b3d195090f972f783727037790c2 (diff) | |
| parent | 8d9901718022f34e9eb93c339dda796da52d0545 (diff) | |
Added handling for RemoveInventoryObjects message. Fixed handling of RemoveInventoryFolder
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 4dfcb85295..b390c933f7 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -897,7 +897,7 @@ bool idle_startup() if (show_connect_box) { LLSLURL slurl; - LLPanelLogin::closePanel(); + //LLPanelLogin::closePanel(); } @@ -944,6 +944,8 @@ bool idle_startup() gViewerWindow->setShowProgress(TRUE); gViewerWindow->setProgressCancelButtonVisible(TRUE, LLTrans::getString("Quit")); + gViewerWindow->revealIntroPanel(); + // Poke the VFS, which could potentially block for a while if // Windows XP is acting up set_startup_status(0.07f, LLTrans::getString("LoginVerifyingCache"), LLStringUtil::null); @@ -1962,8 +1964,8 @@ bool idle_startup() gViewerWindow->getWindow()->resetBusyCount(); gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW); LL_DEBUGS("AppInit") << "Done releasing bitmap" << LL_ENDL; - gViewerWindow->revealIntroPanel(); - //gViewerWindow->setShowProgress(FALSE); // reveal intro video now handles this + //gViewerWindow->revealIntroPanel(); + gViewerWindow->setStartupComplete(); gViewerWindow->setProgressCancelButtonVisible(FALSE); // We're not away from keyboard, even though login might have taken |