From 7f4d17bc5d5ccba6f43eafd8268f94c4a01475a8 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 11 Sep 2014 18:50:02 +0200
Subject: [PATCH] FIRE-13979: Muted chat setting off keyword alert chime

---
 indra/newview/fskeywords.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/fskeywords.cpp b/indra/newview/fskeywords.cpp
index 98ea3f33c5..59c37f272f 100644
--- a/indra/newview/fskeywords.cpp
+++ b/indra/newview/fskeywords.cpp
@@ -99,9 +99,9 @@ bool FSKeywords::chatContainsKeyword(const LLChat& chat, bool is_local)
 // <FS:PP> FIRE-10178: Keyword Alerts in group IM do not work unless the group is in the foreground
 void FSKeywords::notify(const LLChat& chat)
 {
-	if (chat.mFromID != gAgent.getID() || chat.mFromName == SYSTEM_FROM)
+	if (chat.mFromID != gAgentID || chat.mFromName == SYSTEM_FROM)
 	{
-		if (!LLMuteList::getInstance()->isMuted(chat.mFromID))
+		if (!LLMuteList::getInstance()->isMuted(chat.mFromID) && !chat.mMuted)
 		{
 			static LLCachedControl<bool> PlayModeUISndFSKeywordSound(gSavedSettings, "PlayModeUISndFSKeywordSound");
 			if (PlayModeUISndFSKeywordSound)