diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-11-08 19:45:54 -0500 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-11-08 19:45:54 -0500 |
commit | 6bce3d1b9d05dce77db50f3d2c92a70ad6ac8166 (patch) | |
tree | 4e46356e118106d0a7097affb40f954feedd578b /indra/newview/llstartup.cpp | |
parent | 860777473acef16dcff16cd5587038409967e44c (diff) | |
parent | 5fa125ea0b733b3729208d90777d260db5e331e8 (diff) |
reconciled .hgtags
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 ); |