diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-03-19 15:31:27 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-03-19 15:31:27 -0500 |
| commit | f0036519d031f4a5a19181c90839d313920b07f3 (patch) | |
| tree | 3be35e906a5e243c9192e5ebb3dde500aa50d41a /indra/newview/app_settings | |
| parent | 7b4d05894df0b9151dfcf95c3d70c652dc9b922c (diff) | |
| parent | 76eeeadeaadf6f7d7b546382f0daac18a2315f81 (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 992618ba11..c11f3cf978 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9112,28 +9112,19 @@ <key>Value</key> <integer>0</integer> </map> - <key>RenderUseShaderLOD</key> - <map> - <key>Comment</key> - <string>Whether we want to have different shaders for LOD</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> - <key>RenderUseShaderNearParticles</key> - <map> - <key>Comment</key> - <string>Whether we want to use shaders on near particles</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> + + <key>RenderAutoHideSurfaceAreaLimit</key> + <map> + <key>Comment</key> + <string>Maximum surface area of a set of proximal objects inworld before automatically hiding geometry to prevent system overload.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <integer>0</integer> + </map> + <key>RenderVBOEnable</key> <map> <key>Comment</key> |