summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/contributions.txt2
-rw-r--r--indra/newview/llstartup.cpp1
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index e94acb566a..2c66c8a21a 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -406,7 +406,9 @@ Jonathan Yap
STORM-1040
VWR-17801
VWR-24347
+ STORM-975
STORM-990
+ STORM-1020
Kage Pixel
VWR-11
Ken March
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();