diff options
author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-11-13 21:20:05 +0200 |
---|---|---|
committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-11-13 21:20:05 +0200 |
commit | 29e9f792bb9595dbacbc8a4b584b5bf62e7db6c6 (patch) | |
tree | cbd8def6f7434ef3e486a546c9db6cbdc7c4ff8a /indra/newview | |
parent | d75824d520ba1965e48196f8b230ded0f15c5841 (diff) |
CHUI-512 FIXED (New incoming conversations take focus in message panel only and do not show toasts). Rejected update message when floater hasn't focus
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llfloaterimsession.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp index 0c622e07c4..e1dc5b91d0 100644 --- a/indra/newview/llfloaterimsession.cpp +++ b/indra/newview/llfloaterimsession.cpp @@ -142,7 +142,7 @@ void LLFloaterIMSession::newIMCallback(const LLSD& data) LLFloaterIMSession* floater = LLFloaterReg::findTypedInstance<LLFloaterIMSession>("impanel", session_id); // update if visible, otherwise will be updated when opened - if (floater && floater->getVisible()) + if (floater && (floater->getHost()? floater->hasFocus() : floater->getVisible())) { floater->updateMessages(); } |