From f2d2e7e489613769ca40cc838630b20c854942a5 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 12 Dec 2011 11:32:34 -0500
Subject: [PATCH] STORM-1731 Changes per RB comments: changed llwarns to
llinfos, added check so you cannot mute a Linden
---
indra/newview/llimview.cpp | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index daef307601b..f96e7f2cc32 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2450,7 +2450,7 @@ void LLIMMgr::addMessage(
llwarns << "Leaving IM session from initiating muted resident " << from << llendl;
if(!gIMMgr->leaveSession(new_session_id))
{
- llwarns << "Session " << new_session_id << " does not exist." << llendl;
+ llinfos << "Session " << new_session_id << " does not exist." << llendl;
}
return;
}
@@ -2673,6 +2673,9 @@ void LLIMMgr::inviteToSession(
BOOL ad_hoc_invite = FALSE;
BOOL voice_invite = FALSE;
+ bool is_linden = LLMuteList::getInstance()->isLinden(caller_name);
+
+
if(type == IM_SESSION_P2P_INVITE)
{
//P2P is different...they only have voice invitations
@@ -2715,15 +2718,15 @@ void LLIMMgr::inviteToSession(
if (voice_invite &&
"VoiceInviteQuestionDefault" == question_type &&
LLMuteList::getInstance()->isMuted(caller_id) &&
- !LLMuteList::getInstance()->isLinden(caller_name))
+ !is_linden)
{
- llwarns << "Rejecting voice call from initiating muted resident " << caller_name << llendl;
+ 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))
+ if (LLMuteList::getInstance()->isMuted(caller_id) && !is_linden)
{
return;
}
--
GitLab