From 19ac039501b87fbc3564c092a0b96a09fcb31e76 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Thu, 16 Jan 2014 22:48:36 +0100
Subject: [PATCH] FIRE-10940: Added option to suppress group notice text in
 group chat Also, exposing Kadah's FSBetterGroupNoticesToIMLog in Prefs

---
 indra/newview/app_settings/settings.xml       | 11 ++++++++++
 indra/newview/llnotificationhandlerutil.cpp   |  7 ++++++
 .../default/xui/en/panel_preferences_chat.xml | 22 +++++++++++++++++++
 .../default/xui/pl/panel_preferences_chat.xml |  2 ++
 4 files changed, 42 insertions(+)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8d01572b4a..c366c68bb8 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -21213,6 +21213,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>FSGroupNoticesToIMLog</key>
+    <map>
+      <key>Comment</key>
+      <string>Show group notices in group chats, in addition to toasts.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>FSBetterGroupNoticesToIMLog</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index eaf1c8c787..133ce3db74 100755
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -212,6 +212,13 @@ void LLHandlerUtil::logGroupNoticeToIMGroup(
 		return;
 	}
 
+	// <FS:PP> FIRE-10940: Add option to suppress group notice text in group chat
+	if (!gSavedSettings.getBOOL("FSGroupNoticesToIMLog"))
+	{
+		return;
+	}
+	// </FS:PP>
+
 	const std::string group_name = groupData.mName;
 	const std::string sender_name = payload["sender_name"].asString();
 
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 dde716d8b6..4a1f6b6f90 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -714,6 +714,28 @@
                  value="0"/>
             </combo_box>
 
+            <check_box
+             layout="topleft"
+             follows="left|top"
+             top_pad="10"
+             left="30"
+             width="400"
+             height="18"
+             name="FSGroupNoticesToIMLog"
+             control_name="FSGroupNoticesToIMLog"
+             label="Show group notices in group chats, in addition to toasts"/>
+            <check_box
+             enabled_control="FSGroupNoticesToIMLog"
+             layout="topleft"
+             follows="left|top"
+             top_pad="1"
+             left_delta="10"
+             width="400"
+             height="18"
+             name="FSBetterGroupNoticesToIMLog"
+             control_name="FSBetterGroupNoticesToIMLog"
+             label="Show their subjects and authors as well"/>
+
         </panel>
 
         <!-- Chat: Firestorm -->
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 430e290b8e..5868486676 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
@@ -114,6 +114,8 @@
 				<combo_box.item label="Odtwarzaj dźwięk tylko gdy okno jest nieaktywne w tle" name="3"/>
 				<combo_box.item label="Nie odtwarzaj żadnego dźwięku powiadomienia" name="0"/>
 			</combo_box>
+			<check_box name="FSGroupNoticesToIMLog" label="Pokazuj ogłoszenia grup także w czatach grupowych, a nie tylko w tostach"/>
+			<check_box name="FSBetterGroupNoticesToIMLog" label="Pokazuj również ich tematy i autorów"/>
 		</panel>
 		<panel name="ChatFirestorm">
 			<text name="chat_and_im_enhancements">