diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-01-28 21:23:35 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-01-28 21:23:35 -0700 |
| commit | 125e216603e949ac97e4d8b649390f7c41a743c0 (patch) | |
| tree | 4a7bfd367fd436738b13bfa6946137b300568a02 /indra/newview/app_settings | |
| parent | b4b3f78c455a614d7738c29cdc6383e857d6028d (diff) | |
| parent | 948afb8ef436f661dd84e3c343e22934f92570ec (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f72fea1cfb..6630d8f400 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1830,6 +1830,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>DebugShowMemory</key> + <map> + <key>Comment</key> + <string>Show Total Allocated Memory</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>DebugShowRenderInfo</key> <map> <key>Comment</key> |