diff options
| author | Jonathan Yap <none@none> | 2012-01-16 14:27:35 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2012-01-16 14:27:35 -0500 |
| commit | da40427a0be28de943988a4961c728384a453119 (patch) | |
| tree | 8a6419a59c9562c3c8d2cf187d7416a27114fb3b | |
| parent | 3dfb1536fa3bb85f6648a76591e80c3feea9eb83 (diff) | |
STORM-1795 Ad-hoc messages are received even when "Only friends and groups can call or IM me"
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llimview.cpp | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 84f399cc89..9e662c72e2 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -607,6 +607,7 @@ Jonathan Yap STORM-1737 STORM-1733 STORM-1790 + STORM-1795 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index a856bd0bdc..fa7930503b 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 show_message = gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && + LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL ? false : true; + + if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && show_message) { LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg); } |