diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-15 09:26:58 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-15 09:26:58 -0400 |
commit | 6faa6236f520fd1dbbbbe030957a6354f5c45db3 (patch) | |
tree | 907614751c28c888ae7f5ea725a681b34b2f48f0 /indra/newview/llstartup.cpp | |
parent | 174b537953b5a39702c833ab1e83313a80e5e549 (diff) | |
parent | ae3e97024ec60d2c0555bf01ff6e2786232b6dd5 (diff) |
merge changes for storm-28
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r-- | indra/newview/llstartup.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 0eac7d5e2a..f8f9f3ab86 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -775,6 +775,7 @@ bool idle_startup() gViewerWindow->setNormalControlsVisible( FALSE ); gLoginMenuBarView->setVisible( TRUE ); gLoginMenuBarView->setEnabled( TRUE ); + show_debug_menus(); // Hide the splash screen LLSplashScreen::hide(); |