diff options
| author | Cho <cho@lindenlab.com> | 2013-01-30 17:42:12 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-01-30 17:42:12 +0000 |
| commit | 6af899f19e246c7fe4faa1edcdfbcfe9f01dbd25 (patch) | |
| tree | f3e397c09f9acc8681fcd75b9fd6201204a4abba /indra/newview | |
| parent | a7e6dc088fcd3d70dd74f0eef3c120ecd9296913 (diff) | |
| parent | 3f4a5625082ecbd7273983e91eeb6f469c327393 (diff) | |
merging latest changes
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimview.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 3a5743f309..7962d7f27f 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2610,8 +2610,15 @@ void LLIMMgr::addMessage( } } - bool skip_message = (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && - LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL); + bool skip_message = false; + if (gSavedSettings.getBOOL("VoiceCallsFriendsOnly")) + { + // Evaluate if we need to skip this message when that setting is true (default is false) + LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(session_id); + skip_message = (LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL); // Skip non friends... + skip_message &= !session->isGroupSessionType(); // Do not skip group chats... + skip_message &= !(other_participant_id == gAgentID); // You are your best friend... Don't skip yourself + } if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !skip_message) { |