From edb5be4ec0a88931933a27dc7e94d45ea249591d Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 29 Jan 2013 14:41:37 -0800
Subject: [PATCH] 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.
---
indra/newview/llimview.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 8f010850f70..3a5743f3095 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -3454,12 +3454,10 @@ class LLViewerChatterBoxInvitation : public LLHTTPNode
(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;
}
--
GitLab