summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2012-01-20 14:15:31 -0500
committerJonathan Yap <none@none>2012-01-20 14:15:31 -0500
commitd70d57c9387bd94d32cb3e2b71430102f250c6eb (patch)
treeaa62d8dd90529d846a799c7d85084bb087fedb17
parentda40427a0be28de943988a4961c728384a453119 (diff)
STORM-1795 Fix logic error
-rw-r--r--indra/newview/llimview.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index fa7930503b..dbdef9d47b 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2458,8 +2458,14 @@ void LLIMMgr::addMessage(
make_ui_sound("UISndNewIncomingIMSession");
}
- bool show_message = gSavedSettings.getBOOL("VoiceCallsFriendsOnly") &&
- LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL ? false : true;
+ bool show_message = true;
+ if (gSavedSettings.getBOOL("VoiceCallsFriendsOnly"))
+ {
+ if (LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL)
+ {
+ show_messages = false;
+ }
+ }
if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && show_message)
{