diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-03-06 14:31:51 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-03-06 14:31:51 -0500 |
| commit | 61bddc22d97150cd590bc4184355133b6dd3ff87 (patch) | |
| tree | 59b488c8c4edc51096338fab153d9eaf837d27fe /indra/newview/llimview.cpp | |
| parent | a18d4df6c742aa397b70e4dafb41475bd201a558 (diff) | |
| parent | 08ed7f676f2ce38937a03c2a4e823e3564981264 (diff) | |
merge changes for 5.0.2-release
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 2405c3a1a3..2e9332c355 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2703,7 +2703,7 @@ void LLIMMgr::addMessage( // Logically it would make more sense to reject the session sooner, in another area of the // code, but the session has to be established inside the server before it can be left. - if (LLMuteList::getInstance()->isMuted(other_participant_id) && !from_linden) + if (LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !from_linden) { LL_WARNS() << "Leaving IM session from initiating muted resident " << from << LL_ENDL; if(!gIMMgr->leaveSession(new_session_id)) @@ -3011,14 +3011,20 @@ void LLIMMgr::inviteToSession( payload["question_type"] = question_type; //ignore invites from muted residents - if (LLMuteList::getInstance()->isMuted(caller_id) && !is_linden) + if (!is_linden) { - if (voice_invite && "VoiceInviteQuestionDefault" == question_type) + if (LLMuteList::getInstance()->isMuted(caller_id, LLMute::flagVoiceChat) + && voice_invite && "VoiceInviteQuestionDefault" == question_type) { LL_INFOS() << "Rejecting voice call from initiating muted resident " << caller_name << LL_ENDL; LLIncomingCallDialog::processCallResponse(1, payload); + return; + } + else if (LLMuteList::getInstance()->isMuted(caller_id, LLMute::flagAll & ~LLMute::flagVoiceChat)) + { + LL_INFOS() << "Rejecting session invite from initiating muted resident " << caller_name << LL_ENDL; + return; } - return; } LLVoiceChannel* channelp = LLVoiceChannel::getChannelByID(session_id); |