From 7ef7bbef65d8622668bc8a007766f25a70386d27 Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Thu, 12 Apr 2012 23:09:32 +0300 Subject: MAINT-891 FIXED Disabled focus return from modal dialog after viewer logoff. Fixed boost trackable objects usage. --- indra/newview/lltoastalertpanel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/lltoastalertpanel.cpp') 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); } -- cgit v1.2.3