From d70d57c9387bd94d32cb3e2b71430102f250c6eb Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 20 Jan 2012 14:15:31 -0500
Subject: STORM-1795 Fix logic error

---
 indra/newview/llimview.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'indra')

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)
 	{
-- 
cgit v1.2.3