summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/newview/llstartup.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 5d59627a92..43b9a97c01 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -396,6 +396,7 @@ Jonathan Yap
VWR-17801
VWR-24347
STORM-975
+ STORM-1020
Kage Pixel
VWR-11
Ken March
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 0eac7d5e2a..bf712d619d 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();