From 40adc15f0fa4e5dbd37a51ebbbdf8d036f8f5e49 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 10 Sep 2014 19:00:55 +0200
Subject: [PATCH] FIRE-14564 / BUG-7240: When "Only friends and groups can call
 or IM me" is enabled, group chat posts from non-friends are muted

---
 indra/newview/llimview.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 167554fff6..48b0cacae6 100755
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2953,7 +2953,11 @@ void LLIMMgr::addMessage(
 	}
 	bool skip_message = false;
 	bool from_linden = LLMuteList::getInstance()->isLinden(from);
-	if (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && !from_linden)
+	// <FS:Ansariel> FIRE-14564: VoiceCallFriendsOnly prevents receiving of
+	//if (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && !from_linden)
+	if (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && !from_linden &&
+		(dialog == IM_NOTHING_SPECIAL || (dialog == IM_SESSION_INVITE && !gAgent.isInGroup(new_session_id))) )
+	// </FS:Ansariel>
 	{
 		// Evaluate if we need to skip this message when that setting is true (default is false)
 		skip_message = (LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL);	// Skip non friends...