diff options
author | skolb <none@none> | 2009-10-14 10:10:46 -0700 |
---|---|---|
committer | skolb <none@none> | 2009-10-14 10:10:46 -0700 |
commit | 1b1550f284316b244a10a4a6604fedb5d6b18965 (patch) | |
tree | 2416742bb0fa10c646c8490c39c3442fa73f1924 /indra/llui/llmodaldialog.cpp | |
parent | 1d63b145481021c5d0ed16bd0c10c320170d0cf5 (diff) | |
parent | b5768a69b18936282cf55f0a1ecb72ba19849836 (diff) |
Merge
Diffstat (limited to 'indra/llui/llmodaldialog.cpp')
-rw-r--r-- | indra/llui/llmodaldialog.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp index f77ec5f4c7..387af05935 100644 --- a/indra/llui/llmodaldialog.cpp +++ b/indra/llui/llmodaldialog.cpp @@ -297,5 +297,16 @@ void LLModalDialog::onAppFocusGained() } } - - +void LLModalDialog::shutdownModals() +{ + // This method is only for use during app shutdown. ~LLModalDialog() + // checks sModalStack, and if the dialog instance is still there, it + // crumps with "Attempt to delete dialog while still in sModalStack!" But + // at app shutdown, all bets are off. If the user asks to shut down the + // app, we shouldn't have to care WHAT's open. Put differently, if a modal + // dialog is so crucial that we can't let the user terminate until s/he + // addresses it, we should reject a termination request. The current state + // of affairs is that we accept it, but then produce an llerrs popup that + // simply makes our software look unreliable. + sModalStack.clear(); +} |