From 02aeb15dc078d6add8e07263554c35eaf92a97a4 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 12 Sep 2014 09:44:01 +0200 Subject: [PATCH] FIRE-14553: Growl shows notifications from muted objects --- indra/newview/llviewerchat.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/indra/newview/llviewerchat.cpp b/indra/newview/llviewerchat.cpp index 3c71d871fd..78df9c015a 100755 --- a/indra/newview/llviewerchat.cpp +++ b/indra/newview/llviewerchat.cpp @@ -112,15 +112,19 @@ void LLViewerChat::getChatColor(const LLChat& chat, LLColor4& r_color, bool is_l // FIRE-5889: Object IM's Not Triggering Growl Notifications std::string msg = chat.mFromName; std::string prefix = chat.mText.substr(0, 4); - if(prefix == "/me " || prefix == "/me'") + if (prefix == "/me " || prefix == "/me'") { - msg = msg + chat.mText.substr(3); + msg += chat.mText.substr(3); } else { - msg = msg + ": " + chat.mText; + msg += (": " + chat.mText); + } + + if (!chat.mMuted) + { + gGrowlManager->notify(chat.mFromName, msg, GROWL_IM_MESSAGE_TYPE); } - gGrowlManager->notify(chat.mFromName, msg, GROWL_IM_MESSAGE_TYPE); // } else