diff options
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 8b7bb83d0d..c6ac9c9172 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -120,7 +120,6 @@ #include "llhudview.h" #include "llimagebmp.h" #include "llimagej2c.h" -#include "llfloaterinventory.h" #include "llkeyboard.h" #include "lllineeditor.h" #include "llmenugl.h" @@ -1692,6 +1691,10 @@ void LLViewerWindow::shutdownViews() gMorphView->setVisible(FALSE); } + // Delete Tool Tip + delete mToolTip; + mToolTip = NULL; + // Delete all child views. delete mRootView; mRootView = NULL; @@ -1701,15 +1704,12 @@ void LLViewerWindow::shutdownViews() gIMMgr = NULL; gHoverView = NULL; - gFloaterView = NULL; - gMorphView = NULL; + gFloaterView = NULL; + gMorphView = NULL; gHUDView = NULL; gNotifyBoxView = NULL; - - delete mToolTip; - mToolTip = NULL; } void LLViewerWindow::shutdownGL() |