diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-09 09:50:29 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-09 09:50:29 -0800 |
| commit | cf09a48bb21d553c837186cc2e7198801f06691a (patch) | |
| tree | a668e28da71f9fafe6333784400dc8f24671fad6 /indra/newview/llviewerwindow.cpp | |
| parent | 1c1ebd0365a115c736f62fadec37e006cbf43f44 (diff) | |
| parent | 8fdb199707979916d4d3c23cd19fec9fed411aba (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-mediaclasses
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 315b7c52cf..4a86e1ca41 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1726,7 +1726,11 @@ void LLViewerWindow::shutdownViews() // destroy the nav bar, not currently part of gViewerWindow // *TODO: Make LLNavigationBar part of gViewerWindow delete LLNavigationBar::getInstance(); - + + // destroy menus after instantiating navbar above, as it needs + // access to gMenuHolder + cleanup_menus(); + // Delete all child views. delete mRootView; mRootView = NULL; |