diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-03-14 12:03:14 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-03-14 12:03:14 -0400 |
commit | 13705596af001078d185dfe5aa7e98d9642f8c8a (patch) | |
tree | 7731814de2a2d988ba1c4ce2031b4a7f663f28b4 /indra/newview/llstartup.cpp | |
parent | 8903578344987432cebc46d889b94574bc005007 (diff) | |
parent | b7635b6112b7c7fd448aa4400bba2edbf15a5b0a (diff) |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rwxr-xr-x | 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 b98cbd5b78..aee3e6cfe9 100755 --- 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(); |