From 27d65fca94f99ddae205c4858a9a48d0d2590533 Mon Sep 17 00:00:00 2001
From: Liny <liny.odell@phoenixviewer.com>
Date: Fri, 2 Aug 2013 18:44:33 -0700
Subject: [PATCH] Partial fix for FIRE-11222 by disabling standalone IM
 floaters. Proper fix will come from fixing FIRE-11172.

---
 indra/newview/app_settings/settings.xml           | 2 +-
 indra/newview/app_settings/settings_firestorm.xml | 2 ++
 indra/newview/app_settings/settings_hybrid.xml    | 2 ++
 indra/newview/app_settings/settings_latency.xml   | 2 ++
 indra/newview/app_settings/settings_phoenix.xml   | 2 ++
 indra/newview/app_settings/settings_v3.xml        | 2 ++
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3b8fc027b8..0b9f7fbc5b 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -20871,7 +20871,7 @@ Change of this parameter will affect the layout of buttons in notification toast
 	    <key>Comment</key>
 	    <string>Show chat in multiple windows(by default) or in one multi-tabbed window(requires restart)</string>
   	  <key>Persist</key>
-	    <integer>1</integer>
+	    <integer>0</integer>
   	  <key>Type</key>
 	    <string>S32</string>
 	    <key>Value</key>
diff --git a/indra/newview/app_settings/settings_firestorm.xml b/indra/newview/app_settings/settings_firestorm.xml
index 9dbd7465da..94dbfeba7d 100644
--- a/indra/newview/app_settings/settings_firestorm.xml
+++ b/indra/newview/app_settings/settings_firestorm.xml
@@ -243,6 +243,7 @@
     <integer>0</integer>
   </map>
 
+  <!--
   <key>FSChatWindow</key>
   <map>
     <key>Comment</key>
@@ -254,6 +255,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  -->
 
   <key>FSUseWebProfiles</key>
   <map>
diff --git a/indra/newview/app_settings/settings_hybrid.xml b/indra/newview/app_settings/settings_hybrid.xml
index 9a3e21d502..13af1b4451 100644
--- a/indra/newview/app_settings/settings_hybrid.xml
+++ b/indra/newview/app_settings/settings_hybrid.xml
@@ -219,6 +219,7 @@
     <integer>1</integer>
   </map>
 
+  <!--
   <key>FSChatWindow</key>
   <map>
     <key>Comment</key>
@@ -230,6 +231,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  -->
 
   <key>FSUseWebProfiles</key>
   <map>
diff --git a/indra/newview/app_settings/settings_latency.xml b/indra/newview/app_settings/settings_latency.xml
index b591c830d7..7833702d99 100644
--- a/indra/newview/app_settings/settings_latency.xml
+++ b/indra/newview/app_settings/settings_latency.xml
@@ -131,6 +131,7 @@
     <integer>0</integer>
   </map>
 
+  <!--
   <key>FSChatWindow</key>
   <map>
     <key>Comment</key>
@@ -142,6 +143,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  -->
 
   <key>FSUseWebProfiles</key>
   <map>
diff --git a/indra/newview/app_settings/settings_phoenix.xml b/indra/newview/app_settings/settings_phoenix.xml
index 34853e21d2..c1c463ba95 100644
--- a/indra/newview/app_settings/settings_phoenix.xml
+++ b/indra/newview/app_settings/settings_phoenix.xml
@@ -231,6 +231,7 @@
     <integer>0</integer>
   </map>
 
+  <!--
   <key>FSChatWindow</key>
   <map>
     <key>Comment</key>
@@ -242,6 +243,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  -->
 
   <key>FSUseWebProfiles</key>
   <map>
diff --git a/indra/newview/app_settings/settings_v3.xml b/indra/newview/app_settings/settings_v3.xml
index 26385f7f8e..5f4cc5b591 100644
--- a/indra/newview/app_settings/settings_v3.xml
+++ b/indra/newview/app_settings/settings_v3.xml
@@ -243,6 +243,7 @@
     <integer>1</integer>
   </map>
 
+  <!--
   <key>FSChatWindow</key>
   <map>
     <key>Comment</key>
@@ -254,6 +255,7 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  -->
 
   <key>FSUseWebProfiles</key>
   <map>