[STORM-255] As a user I would like to disable incoming Group/IM toasts from showing up.

	This will also take care of STORM-221 since the person that would be affected by
	the toast cha now disable them.

4 files changed, 75 insertions, 3 deletions

diff --git a/doc/contributions.txt b/doc/contributions.txt
index bcf714b29a..210deb3cb1 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -742,6 +742,12 @@ Wilton Lundquist
 	VWR-7682
 Zai Lynch
 	VWR-19505
+Wolfpup Lowenhar
+	SNOW-622
+ 	SNOW-772
+	STORM-255
+ 	VWR-20741
+ 	VWR-20933
 Zarkonnen Decosta
 	VWR-253
 Zi Ree
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 33f5482e50..02e9a10fde 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2567,6 +2567,28 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>DisableGroupToast</key>
+    <map>
+      <key>Comment</key>
+      <string>Disable Incoming Group Toasts</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>DisableIMToast</key>
+    <map>
+      <key>Comment</key>
+      <string>Disable Incoming IM Toasts</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>DisplayAvatarAgentTarget</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index c865dcf9a3..286231523a 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -131,6 +131,20 @@ void toast_callback(const LLSD& msg){
 		return;
 	}
 
+	// *NOTE Skip toasting if the user disable it in preferences/debug settings ~Alexandrea
+	LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(
+				msg["session_id"]);
+	if (gSavedSettings.getBOOL("DisableGroupToast")
+			&& session->isGroupSessionType())
+	{
+		return;
+	}
+	if (gSavedSettings.getBOOL("DisableIMToast")
+			&& !session->isGroupSessionType())
+	{
+		return;
+	}
+
 	// Skip toasting if we have open window of IM with this session id
 	LLIMFloater* open_im_floater = LLIMFloater::findInstance(msg["session_id"]);
 	if (open_im_floater && open_im_floater->getVisible())
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 31e160ec33..3adc174aaf 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -343,7 +343,7 @@
      left="30"
      height="20"
      width="170"
-     top_pad="14">
+     top_pad="7">
      Show IMs in:
     </text>
     <text
@@ -359,8 +359,8 @@
       (requires restart)
       </text>
     <radio_group
+     follows="left|top"
      height="30"
-     layout="topleft"
      left="40"
      control_name="ChatWindow"
      name="chat_window"
@@ -386,6 +386,36 @@
       top_pad="5"
       width="150" />
     </radio_group>
+    <text
+     name="disable_toast_label"
+     follows="left|top"
+     layout="topleft"
+     top_delta="-22" 
+     left="280" 
+     height="10"
+     width="180">
+      Disable incoming notifications:
+      </text>
+    <check_box
+     control_name="DisableGroupToast"
+     name="DisableGroupToast"
+     label="Group chats" 
+     layout="topleft"
+     top_delta="18" 
+     left="295" 
+     height="20"
+     tool_tip="Checking this will turn off Group Toasts poping up"
+     width="400" />
+    <check_box
+     control_name="DisableIMToast"
+     name="DisableIMToast"
+     label="Im chats" 
+     layout="topleft"
+     top_delta="22" 
+     left="295" 
+     height="20"
+     tool_tip="Checking this will turn off IM Chat Toasts poping up"
+     width="400" />
     <check_box
      control_name="TranslateChat"
      enabled="true"
@@ -488,4 +518,4 @@
          name="Korean"
          value="ko" />
     </combo_box>
-</panel>
+</panel>
\ No newline at end of file