diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-08 12:27:33 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-08 12:27:33 +0000 |
| commit | 7660c19ce8fed013eea06450fe6deb4ae92f3ead (patch) | |
| tree | a6b454d6b93a1b8befc1467a4f3570f5fa89a1af /indra/newview/llviewerwindow.cpp | |
| parent | 62f0f426532808755f6d97f34fd2d8c9e5d2fa6a (diff) | |
| parent | 4e28c10971dc4f9a52a7b3f109143dbce3528d21 (diff) | |
Merge from viewer2 trunk.
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 c998924169..19cc8b14ee 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; |