diff options
| author | Jonathan Yap <none@none> | 2012-01-23 17:43:05 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2012-01-23 17:43:05 -0500 |
| commit | 9003c4c54b82cfa2517d264e9437aa294aef5bb9 (patch) | |
| tree | ecf614263c15dc5e5fa28f9195f3143b2bb85f91 /indra/newview | |
| parent | 44436d0240ceeb384d1a2fc05c46ccf1c4034f94 (diff) | |
STORM-1795 Small logic/formatting change
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimview.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 06f57719f5..f621475193 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2458,16 +2458,10 @@ void LLIMMgr::addMessage( make_ui_sound("UISndNewIncomingIMSession"); } - bool show_message = true; - if (gSavedSettings.getBOOL("VoiceCallsFriendsOnly")) - { - if (LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL) - { - show_message = false; - } - } + bool skip_message = (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && + LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL); - if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && show_message) + if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !skip_message) { LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg); } |