CHUI-88 I shouldn't see Conference IMs from people I muted. Fix: In order to mute a user who initiated a conference/group chat, the session must be created on the server side and then left.

meow-7.2.2
Gilbert Gonzales 2013-01-29 14:41:37 -08:00
parent f70504c0ef
commit edb5be4ec0
1 changed files with 3 additions and 5 deletions

View File

@ -3454,12 +3454,10 @@ public:
(time_t) message_params["timestamp"].asInteger();
BOOL is_do_not_disturb = gAgent.isDoNotDisturb();
BOOL is_muted = LLMuteList::getInstance()->isMuted(
from_id,
name,
LLMute::flagTextChat);
if (is_do_not_disturb || is_muted)
//don't return if user is muted b/c proper way to ignore a muted user who
//initiated an adhoc/group conference is to create then leave the session (see STORM-1731)
if (is_do_not_disturb)
{
return;
}