diff options
| author | simon_linden <none@none> | 2013-09-09 16:17:16 -0700 |
|---|---|---|
| committer | simon_linden <none@none> | 2013-09-09 16:17:16 -0700 |
| commit | e2019e8a3b5175eb6d7322fbe7c466f213854640 (patch) | |
| tree | 1e2fbeaeb249e0f3f0f91e94af213c1840438581 /indra/newview/llimview.cpp | |
| parent | 6dd7e0c9ef587c6c05726d407bef8b51018a7a4b (diff) | |
| parent | 2c1d89c57ec21e4790eb14066d2291282a1000b4 (diff) | |
Merge downstream code with viewer-release
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rwxr-xr-x | indra/newview/llimview.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 9e23755d73..2e53effcac 100755 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2670,7 +2670,8 @@ void LLIMMgr::addMessage( name_is_setted = true; } bool skip_message = false; - if (gSavedSettings.getBOOL("VoiceCallsFriendsOnly")) + bool from_linden = LLMuteList::getInstance()->isLinden(from); + if (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && !from_linden) { // Evaluate if we need to skip this message when that setting is true (default is false) skip_message = (LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL); // Skip non friends... @@ -2716,7 +2717,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) && !LLMuteList::getInstance()->isLinden(from)) + if (LLMuteList::getInstance()->isMuted(other_participant_id) && !from_linden) { llwarns << "Leaving IM session from initiating muted resident " << from << llendl; if(!gIMMgr->leaveSession(new_session_id)) |