Merge from viewer-relese and become version 3.8.1

1 files changed, 48 insertions, 48 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c98f0736f2..daeec74364 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -47,7 +47,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>300</real>
+      <real>300.0</real>
     </map>
     <key>AckCollectTime</key>
     <map>
@@ -80,7 +80,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>1</real>
+      <real>1.0</real>
     </map>
     <key>AdvanceSnapshot</key>
     <map>
@@ -1651,7 +1651,7 @@
         <key>Type</key>
         <string>S32</string>
         <key>Value</key>
-        <real>100</real>
+        <integer>100</integer>
     </map>
     <key>ChatLoadGroupTimeout</key>
     <map>
@@ -4271,7 +4271,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>3</real>
+      <real>3.0</real>
     </map>
     <key>FullScreenAutoDetectAspectRatio</key>
     <map>
@@ -6286,7 +6286,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <real>0</real>
+      <integer>0</integer>
     </map>
   <key>MeshEnabled</key>
   <map>
@@ -6297,7 +6297,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <real>1</real>
+    <integer>1</integer>
   </map>
   <key>MeshImportUseSLM</key>
   <map>
@@ -6308,7 +6308,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <real>1</real>
+    <integer>1</integer>
   </map>
   <key>MeshUploadLogXML</key>
   <map>
@@ -6319,7 +6319,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <real>0</real>
+    <integer>0</integer>
   </map>
   <key>MeshUploadFakeErrors</key>
   <map>
@@ -6330,7 +6330,7 @@
     <key>Type</key>
     <string>S32</string>
     <key>Value</key>
-    <real>0</real>
+    <integer>0</integer>
   </map>
   <key>MeshUploadTimeOut</key>
   <map>
@@ -6341,7 +6341,7 @@
     <key>Type</key>
     <string>S32</string>
     <key>Value</key>
-    <real>600</real>
+    <integer>600</integer>
   </map>
   <key>MigrateCacheDirectory</key>
     <map>
@@ -8565,7 +8565,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>64</real>
+    <real>64.0</real>
   </map>
     <key>RenderCubeMap</key>
     <map>
@@ -8701,7 +8701,7 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <real>16</real>
+    <integer>16</integer>
   </map>
 
   <key>RenderEdgeDepthCutoff</key>
@@ -8747,7 +8747,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>4</real>
+    <real>4.0</real>
   </map>
   <key>RenderDeferredSpotShadowBias</key>
   <map>
@@ -8814,7 +8814,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>0</real>
+    <real>0.0</real>
   </map>
 
   <key>RenderDepthPrePass</key>
@@ -9008,7 +9008,7 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <real>0</real>
+    <integer>0</integer>
   </map>
   
   <key>RenderSpecularResX</key>
@@ -9020,7 +9020,7 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <real>1024</real>
+    <integer>1024</integer>
   </map>
 
   <key>RenderSpecularResY</key>
@@ -9032,7 +9032,7 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <real>256</real>
+    <integer>256</integer>
   </map>
 
   <key>RenderSpecularExponent</key>
@@ -9188,7 +9188,7 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <real>4</real>
+    <integer>4</integer>
   </map>
   <key>RenderShadowBlurDistFactor</key>
   <map>
@@ -9355,9 +9355,9 @@
       <string>Vector3</string>
       <key>Value</key>
       <array>
-        <real>1</real>
-        <real>0</real>
-        <real>0</real>
+        <real>1.0</real>
+        <real>0.0</real>
+        <real>0.0</real>
       </array>
     </map>
     <key>RenderGlowMaxExtractAlpha</key>
@@ -9958,7 +9958,7 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <real>0</real>
+    <integer>0</integer>
   </map>
   <key>RenderAutoMuteLogging</key>
   <map>
@@ -10180,7 +10180,7 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <real>250000</real>
+    <integer>250000</integer>
   </map>
   <key>MeshMetaDataDiscount</key>
   <map>
@@ -10191,7 +10191,7 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <real>384</real>
+    <integer>384</integer>
   </map>
   <key>MeshMinimumByteSize</key>
   <map>
@@ -10202,7 +10202,7 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <real>16</real>
+    <integer>16</integer>
   </map>
   <key>MeshBytesPerTriangle</key>
   <map>
@@ -10213,7 +10213,7 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <real>16</real>
+    <integer>16</integer>
   </map>
   <key>Mesh2MaxConcurrentRequests</key>
   <map>
@@ -10345,7 +10345,7 @@
       <key>Type</key>
       <string>U32</string>
       <key>Value</key>
-      <real>1024</real>
+      <integer>1024</integer>
     </map>
     <key>SceneLoadLowMemoryBound</key>
     <map>
@@ -10356,7 +10356,7 @@
       <key>Type</key>
       <string>U32</string>
       <key>Value</key>
-      <real>750</real>
+      <integer>750</integer>
     </map>
     <key>SceneLoadMinRadius</key>
     <map>
@@ -12149,7 +12149,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>6</real>
+      <integer>6</integer>
     </map>
     <key>UICheckboxctrlBtnSize</key>
     <map>
@@ -12160,7 +12160,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>13</real>
+      <integer>13</integer>
     </map>
     <key>UICheckboxctrlHeight</key>
     <map>
@@ -12171,7 +12171,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>16</real>
+      <integer>16</integer>
     </map>
     <key>UICheckboxctrlHPad</key>
     <map>
@@ -12182,7 +12182,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>2</real>
+      <integer>2</integer>
     </map>
     <key>UICheckboxctrlSpacing</key>
     <map>
@@ -12193,7 +12193,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>5</real>
+      <integer>5</integer>
     </map>
     <key>UICheckboxctrlVPad</key>
     <map>
@@ -12204,7 +12204,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>2</real>
+      <integer>2</integer>
     </map>
     <key>UICloseBoxFromTop</key>
     <map>
@@ -12215,7 +12215,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>5</real>
+      <integer>5</integer>
     </map>
     <key>UIExtraTriangleHeight</key>
     <map>
@@ -12226,7 +12226,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>-1</real>
+      <integer>-1</integer>
     </map>
     <key>UIExtraTriangleWidth</key>
     <map>
@@ -12237,7 +12237,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>4</real>
+      <integer>4</integer>
     </map>
     <key>UIFloaterCloseBoxSize</key>
     <map>
@@ -12248,7 +12248,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>16</real>
+      <integer>16</integer>
     </map>
     <key>UIFloaterHPad</key>
     <map>
@@ -12259,7 +12259,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>6</real>
+      <integer>6</integer>
     </map>
     <key>UIFloaterTestBool</key>
     <map>
@@ -12479,7 +12479,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>500</real>
+      <integer>500</integer>
     </map>
     <key>UIMinimizedWidth</key>
     <map>
@@ -12490,7 +12490,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>160</real>
+      <integer>160</integer>
     </map>
     <key>UIMultiSliderctrlSpacing</key>
     <map>
@@ -12501,7 +12501,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>4</real>
+      <integer>4</integer>
     </map>
     <key>UIMultiTrackHeight</key>
     <map>
@@ -13161,7 +13161,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>3</real>
+      <integer>3</integer>
     </map>
     <key>UseCircuitCodeTimeout</key>
     <map>
@@ -15180,9 +15180,9 @@
       <string>Color4</string>
       <key>Value</key>
       <array>
-        <real>0</real>
-        <real>0</real>
-        <real>0</real>
+        <real>0.0</real>
+        <real>0.0</real>
+        <real>0.0</real>
         <real>1.0</real>
       </array>
     </map>
@@ -15499,7 +15499,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>2</real>
+    <real>2.0</real>
   </map>
   <key>TeleportLocalDelay</key>
   <map>
@@ -15510,7 +15510,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>1</real>
+    <real>1.0</real>
   </map>
   <key>FMODExProfilerEnable</key>
   <map>