diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 08:04:26 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 08:04:26 +0000 |
| commit | 9e2cb2f4a00a6acc48738f9df788ad5adfc7d62a (patch) | |
| tree | 1a8d50ed5791e6c5fe3239e88c41ce5d6b561e68 /indra/newview/llviewerwindow.cpp | |
| parent | 745845f79987e4b4ab7f5728746a0eda8898930f (diff) | |
DEV-38942 Eliminate startModal() from LLModalDialog
Also moved TOS and Critical floaters to login debug menu for testing
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 36499fd191..9bdf9d2aac 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1686,6 +1686,10 @@ void LLViewerWindow::shutdownViews() gMorphView->setVisible(FALSE); } + // Delete Tool Tip + delete mToolTip; + mToolTip = NULL; + // Delete all child views. delete mRootView; mRootView = NULL; @@ -1695,15 +1699,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() |