diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-02-06 15:47:08 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-02-06 15:47:08 -0500 |
| commit | 234fe401eceac95048875c1aba8cce15e64f4364 (patch) | |
| tree | 6a20234740c680f8a90d5992b15864ec01a091ec | |
| parent | 8b29cd05a6c6689dba42f685cf27c5dc39cf8854 (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 c5467ba154..3b9c7ad04f 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -610,6 +610,7 @@ Jonathan Yap STORM-1733 STORM-1741 STORM-1790 + STORM-1795 STORM-1788 STORM-1803 STORM-1799 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); } |