diff options
| author | Richard Linden <none@none> | 2011-06-23 11:28:23 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-06-23 11:28:23 -0700 |
| commit | 70fc5af53ffc39c3c0ef32b99a6c83e972b8a117 (patch) | |
| tree | ddc8da9d6365611c777c324b38a91f5346c6228e /indra/newview/llviewerwindow.cpp | |
| parent | b343d25d19a7d21470027da379c7f16bc7fcb9fc (diff) | |
| parent | 715cb3cc0ca968002af247d0ba67a5d3bed76756 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index b1441cc281..cff166b825 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1979,7 +1979,10 @@ void LLViewerWindow::shutdownViews() // destroy the nav bar, not currently part of gViewerWindow // *TODO: Make LLNavigationBar part of gViewerWindow + if (LLNavigationBar::instanceExists()) + { delete LLNavigationBar::getInstance(); + } // destroy menus after instantiating navbar above, as it needs // access to gMenuHolder @@ -4512,6 +4515,14 @@ void LLViewerWindow::setup3DViewport(S32 x_offset, S32 y_offset) glViewport(gGLViewport[0], gGLViewport[1], gGLViewport[2], gGLViewport[3]); } +void LLViewerWindow::revealIntroPanel() +{ + if (mProgressView) + { + mProgressView->revealIntroPanel(); + } +} + void LLViewerWindow::setShowProgress(const BOOL show) { if (mProgressView) |