From 7ed6eccffc7728b68f8df3bc28ee988bb733abc7 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Wed, 6 May 2015 22:33:13 +0200
Subject: [PATCH] FIRE-16035: Add an option to allow friends to bypass
 conference chat ignoring

---
 indra/newview/app_settings/settings.xml       | 11 +++++++++
 indra/newview/llimview.cpp                    | 24 ++++++++++++-------
 .../default/xui/en/panel_preferences_chat.xml | 10 ++++++++
 .../default/xui/pl/panel_preferences_chat.xml |  1 +
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ed79256903..e154361e16 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -22842,6 +22842,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>FSDontIgnoreAdHocFromFriends</key>
+    <map>
+      <key>Comment</key>
+      <string>Allow my friends to start conference chats with me.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>FSFriendListColumnShowUserName</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 7adf6870c3..ad8a0cbd9a 100755
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -3092,18 +3092,24 @@ void LLIMMgr::addMessage(
 		}
 
 		// <FS:PP> Option to automatically ignore and leave all conference (ad-hoc) chats
-		if (dialog != IM_NOTHING_SPECIAL && !is_group_chat && gSavedSettings.getBOOL("FSIgnoreAdHocSessions") && !from_linden)
+		static LLCachedControl<bool> ignoreAdHocSessions(gSavedSettings, "FSIgnoreAdHocSessions");
+		if (dialog != IM_NOTHING_SPECIAL && !is_group_chat && ignoreAdHocSessions && !from_linden)
 		{
-			LL_INFOS() << "Ignoring conference (ad-hoc) chat from " << new_session_id.asString() << LL_ENDL;
-			if (!gIMMgr->leaveSession(new_session_id))
+			static LLCachedControl<bool> dontIgnoreAdHocFromFriends(gSavedSettings, "FSDontIgnoreAdHocFromFriends");
+			if (!dontIgnoreAdHocFromFriends || (dontIgnoreAdHocFromFriends && LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL))
 			{
-				LL_WARNS() << "Ad-hoc session " << new_session_id.asString() << " does not exist." << LL_ENDL;
+				static LLCachedControl<bool> reportIgnoredAdHocSession(gSavedSettings, "FSReportIgnoredAdHocSession");
+				LL_INFOS() << "Ignoring conference (ad-hoc) chat from " << new_session_id.asString() << LL_ENDL;
+				if (!gIMMgr->leaveSession(new_session_id))
+				{
+					LL_WARNS() << "Ad-hoc session " << new_session_id.asString() << " does not exist." << LL_ENDL;
+				}
+				else if (reportIgnoredAdHocSession)
+				{
+					reportToNearbyChat(LLTrans::getString("IgnoredAdHocSession"));
+				}
+				return;
 			}
-			if (gSavedSettings.getBOOL("FSReportIgnoredAdHocSession"))
-			{
-				reportToNearbyChat(LLTrans::getString("IgnoredAdHocSession"));
-			}
-			return;
 		}
 		// </FS:PP>
 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index b4927a3b9d..7c6892227d 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -715,6 +715,16 @@
              name="FSReportIgnoredAdHocSession"
              control_name="FSReportIgnoredAdHocSession"
              label="Report ignored conference chats in nearby chat"/>
+            <check_box
+             layout="topleft"
+             follows="left|top"
+             enabled_control="FSIgnoreAdHocSessions"
+             top_pad="-1"
+             width="30"
+             height="18"
+             name="FSDontIgnoreAdHocFromFriends"
+             control_name="FSDontIgnoreAdHocFromFriends"
+             label="Don't ignore conference chats invitations from my friends"/>
             <text
              name="group_snooze_time_label"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
index ecf04dcca2..d5e5e35f54 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
@@ -117,6 +117,7 @@
 			<check_box name="FSMuteGroupWhenNoticesDisabled" label="Gdy opcja 'otrzymuj ogłoszenia grupy' jest wyłączona - wyłączaj także czat grupy"/>
 			<check_box name="FSIgnoreAdHocSessions" label="Automatycznie ignoruj i opuszczaj wszystkie czaty konferencji (ad-hoc)"/>
 			<check_box name="FSReportIgnoredAdHocSession" label="Zgłaszaj ignorowanie czatu konferencji w czacie lokalnym"/>
+			<check_box name="FSDontIgnoreAdHocFromFriends" label="Nie ignoruj zaproszeń do czatów konferencji od moich znajomych"/>
 			<text width="290" name="group_snooze_time_label" tool_tip="Ilość czasu, przez jaką czat grupowy będzie zablokowany po naciśnięciu przycisku tymczasowego jego wyciszenia. Ustawienie tej wartości na 0 zwyczajnie zamknie czat grupy do czasu, gdy następna wiadomość się w nim nie pojawi.">
 				Długość tymczasowego wyciszenia czatu grupowego:
 			</text>