diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-11 15:57:57 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-11 15:57:57 -0800 |
| commit | d550a7e8bc84284ef4460af9d1cf5a09fc0bcf48 (patch) | |
| tree | d872a5efe7aafdd670bc550dd37a1656c95b4a9c | |
| parent | 1426765e82549ec9d17a0f90d902f25c0e785bbd (diff) | |
| parent | ce975c7572b8253beb07662cddff913b7eabc1e3 (diff) | |
STORM-1020 : pull into viewer-development
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/newview/llstartup.cpp | 1 |
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(); |