From 1abc87139b09d4d333c72eb5ffb576895f1c2a0f Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 8 Apr 2015 13:00:35 -0400
Subject: fix validity errors in settings files

---
 indra/newview/app_settings/settings.xml             | 3 ++-
 indra/newview/app_settings/settings_per_account.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 138bdde9e9..408d82ff69 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5019,6 +5019,7 @@
       <key>Type</key>
       <string>LLSD</string>
       <key>Value</key>
+      <array/>
     </map>
     <key>LSLFindCaseInsensitivity</key>
         <map>
@@ -11774,7 +11775,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <integer>0.0</integer>
+    <real>0.0</real>
   </map>
     <key>TextureFetchSource</key>
     <map>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index d119504017..c62b45ed81 100755
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -97,7 +97,7 @@
         <key>Type</key>
             <string>Boolean</string>
         <key>Value</key>
-            <integer>true</integer>
+            <integer>1</integer>
     </map>   
     <key>InstantMessageLogPath</key>
         <map>
-- 
cgit v1.2.3


From 8be5c8eade832796c34f035547cf09095a85d3f4 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 14 Apr 2015 14:10:38 +0300
Subject: MAINT-5090 Remove disabling HTTP Inventory from Viewer

---
 indra/newview/app_settings/settings.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2eb780ec5d..ed2ce6d81a 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14703,17 +14703,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>UseHTTPInventory</key>
-    <map>
-      <key>Comment</key>
-      <string>Allow use of http inventory transfers instead of UDP</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>ClickToWalk</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3