diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-10-08 22:48:02 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-10-08 22:48:02 -0400 |
| commit | a162496da9044e695bc306321da1fb278259b9c6 (patch) | |
| tree | 2ee9a34e8d39c613be3684855bd90fe11a26cf06 /indra/newview | |
| parent | de7c11d2917c0789faf5c8792100c082a401190a (diff) | |
DEV-40930: At app shutdown, clear LLModalDialog::sModalStack. Otherwise, any
modal dialog still left open will crump on destruction with LL_ERRS. If we
don't want the user to shut down the app with a modal dialog open, we should
deal with it better than a popup that simply makes us look buggy.
Diffstat (limited to 'indra/newview')
| -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 603e02dbc8..d73029df1e 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1631,7 +1631,11 @@ void LLViewerWindow::shutdownViews() { gMorphView->setVisible(FALSE); } - + + // DEV-40930: Clear sModalStack. Otherwise, any LLModalDialog left open + // will crump with LL_ERRS. + LLModalDialog::shutdownModals(); + // Delete all child views. delete mRootView; mRootView = NULL; |