diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-02-09 11:53:14 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-02-09 11:53:14 -0500 |
| commit | e836d90ebb8d84f84c12f2ff9070fcf796aaa2cd (patch) | |
| tree | 07934e0cce1185d571aadb699bf89a5c49dd1f44 | |
| parent | c2e39e9230a8e35f68215a24db3fa79a17e364ca (diff) | |
| parent | 9003c4c54b82cfa2517d264e9437aa294aef5bb9 (diff) | |
merge changes for storm-1795
| -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 7370d7da36..5656babb4c 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -612,6 +612,7 @@ Jonathan Yap STORM-1741 STORM-1790 STORM-1788 + STORM-1795 STORM-1799 STORM-1796 Kadah Coba 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); } |