diff options
| author | Richard Linden <none@none> | 2013-01-11 16:32:47 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-11 16:32:47 -0800 |
| commit | e0f2c608cf2bc724b7cb4a4443bb6a04c7069bf5 (patch) | |
| tree | 923391e3fee69b7302f9c043f5ea0261e5146f02 /indra/newview/app_settings/settings.xml | |
| parent | 91a8383b4a0bbd2d48d2d84678f5bcc3701c2b9f (diff) | |
| parent | ca21e13667a09a8ecdf1468995e38622867e907e (diff) | |
Automated merge with file:///c:%5Ccode%5Cviewer-interesting-metrics
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 557a698d6d..5c0e8d858e 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6389,6 +6389,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>ObjectCacheViewCullingEnabled</key> + <map> + <key>Comment</key> + <string>Enable the object cache view culling. Needs to restart viewer.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>OpenDebugStatAdvanced</key> <map> <key>Comment</key> @@ -9447,6 +9458,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>SceneLoadingMonitorEnabled</key> + <map> + <key>Comment</key> + <string>Enabled scene loading monitor if set</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>ScriptHelpFollowsCursor</key> <map> <key>Comment</key> @@ -10853,7 +10875,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <integer>0.0</integer> + <real>0.0</real> </map> <key>TextureFetchUpdateSkipLowPriority</key> <map> @@ -12492,6 +12514,7 @@ <key>Type</key> <string>LLSD</string> <key>Value</key> + <array /> </map> <key>VFSOldSize</key> <map> |