Merge branch 'master' of git://github.com/siana/SingularityViewer

2012-02-24 18:39:25 -05:00
parent 90ac174260 0bdf54e6d9
commit 72fe406f64
9 changed files with 136 additions and 17 deletions
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4205,6 +4205,17 @@
      <key>Value</key>
      <integer>-1</integer>
    </map>
+    <key>DebugStatModeMalloc</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>DebugStatModeFormattedMem</key>
    <map>
      <key>Comment</key>