diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-28 09:53:42 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-28 09:53:42 -0800 |
| commit | daa5084dd611b45d55598dbdebbb673652877176 (patch) | |
| tree | 086e6d0eb83ae3592091fc6244034bb60ad13ddd /indra/newview/llimview.cpp | |
| parent | c418d616276ce16d910c6e5528f6aa058803e1c7 (diff) | |
| parent | 57795d3c89b6eee3ff68f327d2a6c840350d8dcb (diff) | |
merge
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index cb03c1d234..433ddad35d 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -204,19 +204,16 @@ void on_new_message(const LLSD& msg) bool conversation_floater_not_focused = conversation_floater_is_closed || !im_box->hasFocus(); + // Skip toasting and flashing if we have open window of IM with this session id + if (session_floater + && session_floater->isInVisibleChain() + && !session_floater->isMinimized() + && !(session_floater->getHost() && session_floater->getHost()->isMinimized())) + { + return; + } if ("toast" == action) { - // Skip toasting and flashing if we have open window of IM with this session id - if (session_floater - && session_floater->isInVisibleChain() - && session_floater->hasFocus() - && !session_floater->isMinimized() - && !(session_floater->getHost() && session_floater->getHost()->isMinimized()) - ) - { - return; - } - //User is not focused on conversation containing the message if(session_floater_not_focused) { |