diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-10-28 16:53:45 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-10-28 16:53:45 +0200 |
| commit | 726b00fd18107ef9aebf24b6d56ae8dcbb2003a6 (patch) | |
| tree | 3030989a4c8a2c33991c0b19d001e925306add85 /indra/newview/llviewerwindow.cpp | |
| parent | 0e4f48950be95430a1a6052cd41790d807c31216 (diff) | |
| parent | 2663bad36b4b02003b4b4c5989c2571c71504cd7 (diff) | |
Merge
--HG--
branch : product-engine
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 f3c1cf191a..b0b69fbae6 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1636,7 +1636,11 @@ void LLViewerWindow::shutdownViews() // DEV-40930: Clear sModalStack. Otherwise, any LLModalDialog left open // will crump with LL_ERRS. LLModalDialog::shutdownModals(); - + + // destroy the nav bar, not currently part of gViewerWindow + // *TODO: Make LLNavigationBar part of gViewerWindow + delete LLNavigationBar::getInstance(); + // Delete all child views. delete mRootView; mRootView = NULL; |