Merge branch 'master' into DRTVWR-514-keymappings

3 files changed, 46 insertions, 35 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b81e366b54..626a3d1ff3 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1362,39 +1362,6 @@
       <key>Value</key>
       <integer>23</integer>
     </map>
-    <key>EnableCacheDebugInfo</key>
-    <map>
-      <key>Comment</key>
-      <string>When set, display additional cache debugging information</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>DiskCachePercentOfTotal</key>
-    <map>
-      <key>Comment</key>
-      <string>The percent of total cache size (defined by CacheSize) to use for the disk cache</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>20.0</real>
-    </map>
-    <key>DiskCacheDirName</key>
-    <map>
-      <key>Comment</key>
-      <string>The name of the disk cache (within the standard Viewer disk cache directory)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>cache</string>
-    </map>
     <key>CacheLocation</key>
     <map>
       <key>Comment</key>
@@ -2868,6 +2835,17 @@
       <key>Value</key>
       <integer>-1</integer>
     </map>
+    <key>DebugStatModeVFSPendingOps</key>
+    <map>
+      <key>Comment</key>
+      <string>Mode of stat in Statistics floater</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>-1</integer>
+    </map>
     <key>DebugStatModeTimeDialation</key>
     <map>
       <key>Comment</key>
@@ -3660,6 +3638,17 @@
       <key>Value</key>
       <integer>4</integer>
     </map>
+    <key>DumpVFSCaches</key>
+    <map>
+      <key>Comment</key>
+      <string>Dump VFS caches on startup.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>DynamicCameraStrength</key>
     <map>
       <key>Comment</key>
@@ -11591,7 +11580,7 @@
             <string>Boolean</string>
         <key>Value</key>
             <integer>0</integer>
-    </map>
+    </map> 
     <key>NearbyListShowMap</key>
     <map>
       <key>Comment</key>
@@ -14269,6 +14258,28 @@
       <key>Value</key>
       <string/>
     </map>
+    <key>VFSOldSize</key>
+    <map>
+      <key>Comment</key>
+      <string>[DO NOT MODIFY] Controls resizing of local file cache</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>VFSSalt</key>
+    <map>
+      <key>Comment</key>
+      <string>[DO NOT MODIFY] Controls local file caching behavior</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>VelocityInterpolate</key>
     <map>
       <key>Comment</key>
@@ -16610,7 +16621,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>1</integer>        
     </map>
 </map>
 </llsd>
diff --git a/indra/newview/app_settings/static_data.db2 b/indra/newview/app_settings/static_data.db2
new file mode 100644
index 0000000000..f85aa81601
--- /dev/null
+++ b/indra/newview/app_settings/static_data.db2
diff --git a/indra/newview/app_settings/static_index.db2 b/indra/newview/app_settings/static_index.db2
new file mode 100644
index 0000000000..a5440f96f2
--- /dev/null
+++ b/indra/newview/app_settings/static_index.db2