diff options
| author | maxim@mnikolenko <maxim@mnikolenko> | 2013-01-09 15:08:58 +0200 |
|---|---|---|
| committer | maxim@mnikolenko <maxim@mnikolenko> | 2013-01-09 15:08:58 +0200 |
| commit | bb05a29374b2c9691937ccb15cdbff466fd775f1 (patch) | |
| tree | 6375d7f6cd7d040c2f141d812e7e1b5caa7c131f | |
| parent | df5378cf38b0e8325ae41be8af772e30cb815dd4 (diff) | |
CHUI-638 FIXED Don't force button and widget to flash if the object is muted.
| -rw-r--r-- | indra/newview/llimview.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 0011f54175..0326235d37 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -225,12 +225,17 @@ void on_new_message(const LLSD& msg) //User is not focused on conversation containing the message if(session_floater_not_focused) { - im_box->flashConversationItemWidget(session_id, true); - + if(!LLMuteList::getInstance()->isMuted(participant_id)) + { + im_box->flashConversationItemWidget(session_id, true); + } //The conversation floater isn't focused/open if(conversation_floater_not_focused) { - gToolBarView->flashCommand(LLCommandId("chat"), true); + if(!LLMuteList::getInstance()->isMuted(participant_id)) + { + gToolBarView->flashCommand(LLCommandId("chat"), true); + } //Show IM toasts (upper right toasts) // Skip toasting for system messages and for nearby chat |