diff options
| author | richard <none@none> | 2010-02-05 14:20:51 -0800 |
|---|---|---|
| committer | richard <none@none> | 2010-02-05 14:20:51 -0800 |
| commit | 34003b22d71e682a0efe19da851a66d20b99af00 (patch) | |
| tree | 414157f23d748af0d271872dc91edd673741877d | |
| parent | a4b833f36512658d2aca912a7d58712947ce2f9f (diff) | |
| parent | e75a4ffb6ae085c941e1e1b779e987de0e6c80b6 (diff) | |
merge
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index f2b3c7826c..a3720769a1 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1353,9 +1353,6 @@ bool LLAppViewer::cleanup() llinfos << "Cache files removed" << llendflush; - - cleanup_menus(); - // Wait for any pending VFS IO while (1) { 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; |