diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 639376c9fbb4b4d59226e4d6a8119e2fc4961001..2a2e89153f75151f79f808c72c6e0f9312df68f0 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -381,7 +381,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>300.0</real>
+      <integer>300</integer>
     </map>
     <key>AckCollectTime</key>
     <map>
@@ -628,7 +628,7 @@
     <key>AudioLevelMedia</key>
     <map>
       <key>Comment</key>
-      <string>Audio level of Quicktime movies</string>
+      <string>Audio level of parcel Media</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -3845,7 +3845,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>DoubleClickShowWorldMap</key>
     <map>
@@ -4142,7 +4142,7 @@
         <key>Type</key>
         <string>F32</string>
         <key>Value</key>
-        <real>10.0</real>
+        <real>15.0</real>
         </map>
     <key>FilterItemsMaxTimePerFrameVisible</key>
     <map>
@@ -6047,7 +6047,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>40.0</real>
+    <real>60.0</real>
   </map>
   <key>LoginSRVPump</key>
   <map>
@@ -7004,7 +7004,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>256.0</real>
+      <real>64.0</real>
     </map>
     <key>MiniMapRotate</key>
     <map>
@@ -7191,7 +7191,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <integer>130</integer>
+      <real>4096.0</real>
     </map>
     <key>NewObjectCreationThrottle</key>
     <map>
@@ -7867,7 +7867,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>2</integer>
     </map>
     <key>ParticipantListShowIcons</key>
     <map>
@@ -8568,7 +8568,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>QAMode</key>
     <map>
@@ -10333,7 +10333,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>NameTagShowUsernames</key>
     <map>
@@ -11562,7 +11562,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>NavBarShowParcelProperties</key>
     <map>
@@ -11617,7 +11617,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>ShowEventRecorderMenuItems</key>
     <map>
@@ -11914,7 +11914,7 @@
       <key>Type</key>
       <string>U32</string>
       <key>Value</key>
-      <integer>4</integer>
+      <integer>3</integer>
     </map>
     <key>RecentPeopleSortOrder</key>
     <map>
@@ -12291,7 +12291,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>ShowSelectionBeam</key>
     <map>
@@ -15449,6 +15449,15 @@
         <key>Value</key>
             <real>1</real>
         </map>
+    <key>PoolSizeExpCache</key>
+        <map>
+        <key>Comment</key>
+            <string>Coroutine Pool size for Experience Cache</string>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
     <key>PoolSizeAssetStorage</key>
         <map>
         <key>Comment</key>
@@ -15853,7 +15862,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>ShowOfferedInventory</key>
     <map>