From 5db02993ef806d2d73ae3e3fde89c3405132a348 Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Mon, 27 Sep 2010 20:20:09 -0400
Subject: [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.

---
 .../default/xui/en/panel_preferences_chat.xml      | 36 ++++++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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
-- 
cgit v1.2.3


From 2a869d52f189a31c185b93f6425dd3e3dd8e927f Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Tue, 28 Sep 2010 14:14:10 -0400
Subject: update for STORM-255 to correct small issue with tool tip in
 pannel_preferences_chat.xml

---
 indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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 3adc174aaf..e36415832c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -366,7 +366,7 @@
      name="chat_window"
      top_pad="0"
      tool_tip="Show your Instant Messages in separate floaters, or in one floater with many tabs (Requires restart)"
-     width="331">
+     width="150">
      <radio_item
       height="16"
       label="Separate windows"
-- 
cgit v1.2.3


From 6da1e54e6a8b66a2cad7c8c89de279ca5b9ac7dd Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Mon, 25 Oct 2010 11:43:50 -0400
Subject: Inverting settings and test so that telling other how to turn off the
 messages popping is easier as per discussion with Oz and Boroondas also
 correcting some minor spelling issues

---
 .../skins/default/xui/en/panel_preferences_chat.xml        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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 e36415832c..77f3405ed9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -394,27 +394,27 @@
      left="280" 
      height="10"
      width="180">
-      Disable incoming notifications:
+      Enable Incoming Messages:
       </text>
     <check_box
-     control_name="DisableGroupToast"
-     name="DisableGroupToast"
+     control_name="EnableGroupToast"
+     name="EnableGroupToast"
      label="Group chats" 
      layout="topleft"
      top_delta="18" 
      left="295" 
      height="20"
-     tool_tip="Checking this will turn off Group Toasts poping up"
+     tool_tip="Checking this will turn on Group Messages popping up"
      width="400" />
     <check_box
-     control_name="DisableIMToast"
-     name="DisableIMToast"
+     control_name="EnableIMToast"
+     name="EnableIMToast"
      label="Im chats" 
      layout="topleft"
      top_delta="22" 
      left="295" 
      height="20"
-     tool_tip="Checking this will turn off IM Chat Toasts poping up"
+     tool_tip="Checking this will turn on IM Chat Messages popping up"
      width="400" />
     <check_box
      control_name="TranslateChat"
-- 
cgit v1.2.3


From 8bef9cc8137dc58b818c60dd1173959fcab40bd8 Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Tue, 26 Oct 2010 09:32:56 -0400
Subject: Correction to pannel_preferences_chat.xml os it reads 'IM chat'
 instead of Im chat'

---
 indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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 77f3405ed9..45d7633f73 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -409,7 +409,7 @@
     <check_box
      control_name="EnableIMToast"
      name="EnableIMToast"
-     label="Im chats" 
+     label="IM chats" 
      layout="topleft"
      top_delta="22" 
      left="295" 
-- 
cgit v1.2.3


From 379f9b824087a44f7ffab0becfafaa29611751be Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Wed, 27 Oct 2010 11:00:39 -0400
Subject: Made changes to setting names and in pannel_preferences_chat.xml for
 better understanding  as per Esbee's comments in STORM-255

---
 .../skins/default/xui/en/panel_preferences_chat.xml        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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 45d7633f73..e8f36b5298 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -394,12 +394,12 @@
      left="280" 
      height="10"
      width="180">
-      Enable Incoming Messages:
+      Enable Incoming Chat popups:
       </text>
     <check_box
-     control_name="EnableGroupToast"
-     name="EnableGroupToast"
-     label="Group chats" 
+     control_name="EnableGroupChatPopups"
+     name="EnableGroupChatPopups"
+     label="Group Chats" 
      layout="topleft"
      top_delta="18" 
      left="295" 
@@ -407,9 +407,9 @@
      tool_tip="Checking this will turn on Group Messages popping up"
      width="400" />
     <check_box
-     control_name="EnableIMToast"
-     name="EnableIMToast"
-     label="IM chats" 
+     control_name="EnableIMChatPopups"
+     name="EnableIMChatPopups"
+     label="IM Chats" 
      layout="topleft"
      top_delta="22" 
      left="295" 
-- 
cgit v1.2.3


From d3bc9b3e752935bffc5e808fd41a43af45568788 Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Mon, 1 Nov 2010 22:29:09 -0400
Subject: STORM-255 : Made changes to the tool tips for the check boxes  in
 panel_prefferences_chat.xml

---
 indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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 8a20c3cb16..85824c2576 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -436,7 +436,7 @@
      top_delta="18" 
      left="295" 
      height="20"
-     tool_tip="Checking this will turn on Group Messages popping up"
+     tool_tip="Check to see popups when a Group Chat message arrives"
      width="400" />
     <check_box
      control_name="EnableIMChatPopups"
@@ -446,7 +446,7 @@
      top_delta="22" 
      left="295" 
      height="20"
-     tool_tip="Checking this will turn on IM Chat Messages popping up"
+     tool_tip="Check to see popups when an instant message arrives"
      width="400" />
     <check_box
      control_name="TranslateChat"
-- 
cgit v1.2.3