diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2012-04-12 23:09:32 +0300 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2012-04-12 23:09:32 +0300 |
| commit | 7ef7bbef65d8622668bc8a007766f25a70386d27 (patch) | |
| tree | ed28c605ccc318e6b34d762b912fcb3e5fa53657 /indra/newview/lltoastalertpanel.cpp | |
| parent | a5ef634b06a87f3738e14f5a375e19c0c5ac38f3 (diff) | |
MAINT-891 FIXED Disabled focus return from modal dialog after viewer logoff.
Fixed boost trackable objects usage.
Diffstat (limited to 'indra/newview/lltoastalertpanel.cpp')
| -rw-r--r-- | indra/newview/lltoastalertpanel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp index 9ba8431fde..8fef2ed6d1 100644 --- a/indra/newview/lltoastalertpanel.cpp +++ b/indra/newview/lltoastalertpanel.cpp @@ -424,8 +424,8 @@ LLToastAlertPanel::~LLToastAlertPanel() LLTransientFloaterMgr::GLOBAL, this); // EXP-1822 - // return focus to the previously focused view - if (mPreviouslyFocusedView.get()) + // return focus to the previously focused view if the viewer is not exiting + if (mPreviouslyFocusedView.get() && !LLApp::isExiting()) { mPreviouslyFocusedView.get()->setFocus(TRUE); } |