diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:55:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:55:20 -0500 |
| commit | a7aa89e2cb98c28be7b20bcae6dc1cb47f4d56c1 (patch) | |
| tree | 1f7a629558c2edce2915cc6419284099f176708e /indra/newview/llimview.cpp | |
| parent | f712614d7bfb132cf0d4bc5ff5e2e02ea73a9bda (diff) | |
| parent | 381d5829db58412dca9abe30137f1e3796420b72 (diff) | |
merge changes for vmrg-226
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index a856bd0bdc..f621475193 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2458,7 +2458,10 @@ void LLIMMgr::addMessage( make_ui_sound("UISndNewIncomingIMSession"); } - if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat)) + bool skip_message = (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && + LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL); + + if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !skip_message) { LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg); } |