From 54983ec79f536188a2a4de7e7a6e14cb1bb754cd Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
Date: Sun, 20 Oct 2013 21:27:10 -0700
Subject: [PATCH] Fix for FIRE-11749, made FSLegacyEdgeSnap non-persist
 skin-only setting

---
 indra/newview/app_settings/settings.xml         |  2 +-
 indra/newview/app_settings/settings_latency.xml | 12 ------------
 indra/newview/app_settings/settings_phoenix.xml | 12 ------------
 indra/newview/skins/vintage/settings.xml        | 15 +++++++++++++++
 4 files changed, 16 insertions(+), 25 deletions(-)
 create mode 100644 indra/newview/skins/vintage/settings.xml

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9c50d8a4cc..90e955c9e0 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -21164,7 +21164,7 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Comment</key>
       <string>Use old method for adjusting edge snap regions.</string>
       <key>Persist</key>
-      <integer>1</integer>
+      <integer>0</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
diff --git a/indra/newview/app_settings/settings_latency.xml b/indra/newview/app_settings/settings_latency.xml
index c70f757f54..67689cdc57 100644
--- a/indra/newview/app_settings/settings_latency.xml
+++ b/indra/newview/app_settings/settings_latency.xml
@@ -578,18 +578,6 @@
 			<integer>1</integer>
 		</map>
 
-    <key>FSLegacyEdgeSnap</key>
-		<map>
-		<key>Persist</key>
-			<integer>1</integer>
-		<key>Comment</key>
-			<string>Use old method for adjusting edge snap regions.</string>
-		<key>Type</key>
-			<string>Boolean</string>
-		<key>Value</key>
-			<integer>1</integer>
-		</map>
-
 	<key>FSGroupNotifyNoTransparency</key>
 		<map>
 		<key>Persist</key>
diff --git a/indra/newview/app_settings/settings_phoenix.xml b/indra/newview/app_settings/settings_phoenix.xml
index c2f6c66f63..5e48514de5 100644
--- a/indra/newview/app_settings/settings_phoenix.xml
+++ b/indra/newview/app_settings/settings_phoenix.xml
@@ -459,18 +459,6 @@
     <integer>1</integer>
   </map>
 
-  <key>FSLegacyEdgeSnap</key>
-  <map>
-    <key>Comment</key>
-    <string>Use old method for adjusting edge snap regions.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
-
   <key>MediaFilterSinglePrompt</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/skins/vintage/settings.xml b/indra/newview/skins/vintage/settings.xml
new file mode 100644
index 0000000000..35e95dea80
--- /dev/null
+++ b/indra/newview/skins/vintage/settings.xml
@@ -0,0 +1,15 @@
+<llsd>
+<map>
+    <key>FSLegacyEdgeSnap</key>
+	<map>
+		<key>Comment</key>
+			<string>Use old method for adjusting edge snap regions.</string>
+		<key>Persist</key>
+			<integer>1</integer>
+		<key>Type</key>
+			<string>Boolean</string>
+		<key>Value</key>
+			<integer>1</integer>
+	</map>
+</map>
+</llsd>