summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-01-09 14:30:10 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2013-01-09 14:30:10 -0800
commit41d5f820ea1859493b7f14d9d81b145a6a3b38b6 (patch)
tree98c67a2a222dd54b7077fd8b39c40130a03698f8
parent6a30c4c3c54f3d70d1a10fb76e7c81cd5e36a524 (diff)
CHUI-670: Prevent flashing of 'Chat' FUI button while in DND mode and receive IM.
-rw-r--r--indra/newview/llimview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index a3c338831c..067f0d1993 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -228,7 +228,8 @@ void on_new_message(const LLSD& msg)
//The conversation floater isn't focused/open
if(conversation_floater_not_focused)
{
- if(!LLMuteList::getInstance()->isMuted(participant_id))
+ if(!LLMuteList::getInstance()->isMuted(participant_id)
+ && !gAgent.isDoNotDisturb())
{
gToolBarView->flashCommand(LLCommandId("chat"), true);
}