diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-02-01 11:28:22 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-02-01 11:28:22 -0500 |
commit | fbc6e5d63970e081d7543f884fcc0fb897fce28e (patch) | |
tree | e722e908e0cc1f889be16a4815286172222dac6b /indra/newview/app_settings/settings.xml | |
parent | 293b35f000ca4e8a4bcf85dc4782b2a72d1887ea (diff) | |
parent | f0074f1002f36ad680ae04daf3f5e026dca31d54 (diff) |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-x | indra/newview/app_settings/settings.xml | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 66dd11547f..6f47d9c019 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -697,28 +697,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>BrowserUseDefaultCAFile</key> - <map> - <key>Comment</key> - <string>Tell the built-in web browser to use the CA.pem file shipped with the client.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> - <key>BrowserCAFilePath</key> - <map> - <key>Comment</key> - <string>Tell the built-in web browser the path to an alternative CA.pem file (only used if BrowserUseDefaultCAFile is false).</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string></string> - </map> <key>BlockAvatarAppearanceMessages</key> <map> <key>Comment</key> @@ -1179,7 +1157,7 @@ <key>Type</key> <string>U32</string> <key>Value</key> - <integer>20000</integer> + <integer>128</integer> </map> <key>CacheSize</key> <map> @@ -1901,6 +1879,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> @@ -1934,10 +1923,21 @@ <key>Value</key> <integer>0</integer> </map> + <key>DebugShowTextureInfo</key> + <map> + <key>Comment</key> + <string>Show inertested texture info</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>DebugShowTime</key> <map> <key>Comment</key> - <string>Show depth buffer contents</string> + <string>Show time info</string> <key>Persist</key> <integer>1</integer> <key>Type</key> |