summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2015-04-07 12:06:23 +0300
committerandreykproductengine <akleshchev@productengine.com>2015-04-07 12:06:23 +0300
commitca446ad0b771fa4380bfdb671b1dc29e70a993bd (patch)
tree9485a7d9460f9528df5cef93c579304e7ebb3517 /indra/newview/llviewermessage.cpp
parent42471d556b6209ad830f11ddb158cd2f9d152850 (diff)
MAINT-5036 FIXED Blocked user can send invites to group
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rwxr-xr-xindra/newview/llviewermessage.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 2704aa2050..99c7673f85 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2707,6 +2707,13 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
break;
case IM_GROUP_INVITATION:
{
+ if (!is_muted)
+ {
+ // group is not blocked, but we still need to check agent that sent the invitation
+ // and we have no agent's id
+ // Note: server sends username "first.last".
+ is_muted |= LLMuteList::getInstance()->isMuted(name);
+ }
if (is_do_not_disturb || is_muted)
{
send_do_not_disturb_message(msg, from_id);