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

FIRE-14553: Growl shows notifications from muted objects

Ansariel 2014-09-12 09:44:01 +02:00
parent cc14c46b04
commit 02aeb15dc0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llviewerchat.cpp
View File

@ -112,15 +112,19 @@ void LLViewerChat::getChatColor(const LLChat& chat, LLColor4& r_color, bool is_l
// <FS:LO> 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);
// </FS:LO>
}
else