diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-03-25 11:29:39 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-03-25 11:29:39 +0200 |
| commit | 4ec9637299e482cec47762cbbc74bcce7d710639 (patch) | |
| tree | 12dbdb8bce55fda28c666599c8ce78bd16491de8 /indra/newview/llviewermessage.cpp | |
| parent | 3805808cafd1a78436f1906f5e554855fd3cb3f7 (diff) | |
MAINT-5016 FIXED Skip messages from muted objects.
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 056114cb6b..2704aa2050 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3601,6 +3601,11 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) is_linden = chat.mSourceType != CHAT_SOURCE_OBJECT && LLMuteList::getInstance()->isLinden(from_name); + if (is_muted && (chat.mSourceType == CHAT_SOURCE_OBJECT)) + { + return; + } + BOOL is_audible = (CHAT_AUDIBLE_FULLY == chat.mAudible); chatter = gObjectList.findObject(from_id); if (chatter) |