diff options
author | Jonathan Yap <none@none> | 2011-12-12 14:48:36 -0500 |
---|---|---|
committer | Jonathan Yap <none@none> | 2011-12-12 14:48:36 -0500 |
commit | 2c9db624fb6a463efbd8a208d6d7f3bae72c0211 (patch) | |
tree | bf88b7b4e68580dc70f6f61118b69131de9a739b /indra/newview | |
parent | f2d2e7e489613769ca40cc838630b20c854942a5 (diff) |
STORM-1731 Adjusted if muted logic slightly
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llimview.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index f96e7f2cc3..a856bd0bdc 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; } |