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

3 files changed, 15 insertions, 15 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3015dc523a..8ec812d59e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2567,27 +2567,27 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>DisableGroupToast</key>
+    <key>EnableGroupToast</key>
     <map>
       <key>Comment</key>
-      <string>Disable Incoming Group Toasts</string>
+      <string>Enable Incoming Group Toasts</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
-    <key>DisableIMToast</key>
+    <key>EnableIMToast</key>
     <map>
       <key>Comment</key>
-      <string>Disable Incoming IM Toasts</string>
+      <string>Enable Incoming IM Toasts</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>DisplayAvatarAgentTarget</key>
     <map>
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 410a20ffd0..79d524006d 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -134,12 +134,12 @@ void toast_callback(const LLSD& msg){
 	// *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")
+	if (!gSavedSettings.getBOOL("EnableGroupToast")
 			&& session->isGroupSessionType())
 	{
 		return;
 	}
-	if (gSavedSettings.getBOOL("DisableIMToast")
+	if (!gSavedSettings.getBOOL("EnableIMToast")
 			&& !session->isGroupSessionType())
 	{
 		return;
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"