diff options
| author | Richard Linden <none@none> | 2011-11-02 10:35:09 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-02 10:35:09 -0700 |
| commit | 2c3fc19aac83b92651cc058126aff0ba66d1ad3c (patch) | |
| tree | a829e2086442b09baa84fa6ae74c30595844b1a9 /indra/newview/llstartup.cpp | |
| parent | 148e5f436dbb6f9126f1f6235e9056d4fb14ca66 (diff) | |
| parent | 5e1bb6fbaaba4b1fbcb2b25a3fe9b9d9148e806a (diff) | |
Automated merge with bundle:c:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.ybhs9f\ssh__richard@hg.lindenlab.com_callum_viewer-experience-llqtwebkit_w9twsb.hg
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index e62227fa3c..9d8d1be0f5 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -190,6 +190,7 @@ #include "lllogin.h" #include "llevents.h" #include "llstartuplistener.h" +#include "lltoolbarview.h" #if LL_WINDOWS #include "lldxhardware.h" @@ -2091,7 +2092,12 @@ void login_show() #else BOOL bUseDebugLogin = TRUE; #endif - + // Hide the toolbars: may happen to come back here if login fails after login agent but before login in region + if (gToolBarView) + { + gToolBarView->setVisible(FALSE); + } + LLPanelLogin::show( gViewerWindow->getWindowRectScaled(), bUseDebugLogin || gSavedSettings.getBOOL("SecondLifeEnterprise"), login_callback, NULL ); |