diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-03-06 18:45:40 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-03-06 18:45:40 -0800 |
| commit | 179195241f5579ceeea682d7faf23dc2376338ec (patch) | |
| tree | aef237271227a9faccc1414173c7efd6d4c5657a /indra/newview/llimview.cpp | |
| parent | 4458986cf22a749d3387085a70ea07930519b8ab (diff) | |
| parent | 236eefd9c8afbdd1f9e8b32cd8d356a6c0b6b2ac (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index d69bd89f13..8f3f5145a9 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -273,7 +273,7 @@ void on_new_message(const LLSD& msg) } } - else if("openconversations" == action && !session_floater_is_open) + else if("openconversations" == action) { //User is not focused on conversation containing the message if(session_floater_not_focused) @@ -291,7 +291,8 @@ void on_new_message(const LLSD& msg) //useMostItrusiveIMNotification will be called to notify user a message exists if(session_id.notNull() && participant_id.notNull() - && gAgent.isDoNotDisturb()) + && gAgent.isDoNotDisturb() + && !session_floater_is_open) { LLAvatarNameCache::get(participant_id, boost::bind(&on_avatar_name_cache_toast, _1, _2, msg)); } |