From 2c9db624fb6a463efbd8a208d6d7f3bae72c0211 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 12 Dec 2011 14:48:36 -0500
Subject: [PATCH] STORM-1731 Adjusted if muted logic slightly
---
indra/newview/llimview.cpp | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index f96e7f2cc32..a856bd0bdc6 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2714,20 +2714,15 @@ void LLIMMgr::inviteToSession(
payload["session_uri"] = session_uri;
payload["notify_box_type"] = notify_box_type;
payload["question_type"] = question_type;
-
- if (voice_invite &&
- "VoiceInviteQuestionDefault" == question_type &&
- LLMuteList::getInstance()->isMuted(caller_id) &&
- !is_linden)
- {
- llinfos << "Rejecting voice call from initiating muted resident " << caller_name << llendl;
- LLIncomingCallDialog::processCallResponse(1, payload);
- return;
- }
//ignore invites from muted residents
if (LLMuteList::getInstance()->isMuted(caller_id) && !is_linden)
{
+ if (voice_invite && "VoiceInviteQuestionDefault" == question_type)
+ {
+ llinfos << "Rejecting voice call from initiating muted resident " << caller_name << llendl;
+ LLIncomingCallDialog::processCallResponse(1, payload);
+ }
return;
}
--
GitLab