From 0f8085320a73dbf61b0d970929f2245f6527ea7e Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Sat, 23 Jun 2012 15:35:32 -0500
Subject: [PATCH] FIRE-6650: Only check for non-friends in ad hoc conferences
 when user selects "only groups and friends can IM me". From MartinRJ Fayray
 in VWR-29148/STORM-1890.

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

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index abf20ee6fc..7ee4e32b52 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2611,8 +2611,20 @@ void LLIMMgr::addMessage(
 		make_ui_sound("UISndNewIncomingIMSession");
 	}
 
-	bool skip_message = (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") &&
-		LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL);
+	//<FS:TS> FIRE-6650: Group chat for non-friends mutes when disabling voice chat from non-friends
+	bool skip_message = false;
+	LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(new_session_id);
+	if (session)
+	{
+		if (session->isAdHoc())
+		{
+			skip_message = (other_participant_id != gAgentID && gSavedSettings.getBOOL("VoiceCallsFriendsOnly") &&
+				LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL);
+		}
+	}
+	//bool skip_message = (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") &&
+	//	LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL);
+	//</FS:TS> FIRE-6650
 
 	if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !skip_message)
 	{