livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-13979: Muted chat setting off keyword alert chime

Ansariel 2014-09-11 18:50:02 +02:00
parent a38473a663
commit 7f4d17bc5d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/fskeywords.cpp
View File

@ -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)