diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-10-26 17:11:23 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-10-26 17:11:23 -0400 |
| commit | f676b02c45e81da5b22762acddcab8a8aa1cff71 (patch) | |
| tree | e25d649f443ea3be3a1f5eafa03c258135e186aa /indra/newview/app_settings | |
| parent | 69ff937e47248eca0a4f876efebe97ee57bd4da9 (diff) | |
| parent | 14deeb4955a7eb7d6b7a4edff63fee036c19f1a1 (diff) | |
merge changes for MAINT-5673
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/high_graphics.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/app_settings/low_graphics.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/app_settings/mid_graphics.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 4 | ||||
| -rwxr-xr-x | indra/newview/app_settings/ultra_graphics.xml | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/app_settings/high_graphics.xml b/indra/newview/app_settings/high_graphics.xml index deb58a4b58..f66ba3c4df 100755 --- a/indra/newview/app_settings/high_graphics.xml +++ b/indra/newview/app_settings/high_graphics.xml @@ -29,7 +29,7 @@ <!--Avater Impostors and Visual Muting Limits--> <RenderAvatarMaxNonImpostors value="20"/> <RenderAvatarMaxComplexity value="350000"/> - <RenderAutoMuteSurfaceAreaLimit value="1.0E6"/> + <RenderAutoMuteSurfaceAreaLimit value="10.0E6"/> <!--Default for now--> <RenderVolumeLODFactor value="1.125"/> <!--NO SHADERS--> diff --git a/indra/newview/app_settings/low_graphics.xml b/indra/newview/app_settings/low_graphics.xml index fcab574988..304e7c7347 100755 --- a/indra/newview/app_settings/low_graphics.xml +++ b/indra/newview/app_settings/low_graphics.xml @@ -29,7 +29,7 @@ <!--Avater Impostors and Visual Muting Limits--> <RenderAvatarMaxNonImpostors value="12"/> <RenderAvatarMaxComplexity value="75000"/> - <RenderAutoMuteSurfaceAreaLimit value="1.0E6"/> + <RenderAutoMuteSurfaceAreaLimit value="10.0E6"/> <!--Default for now--> <RenderVolumeLODFactor value="1.125"/> <!--NO SHADERS--> diff --git a/indra/newview/app_settings/mid_graphics.xml b/indra/newview/app_settings/mid_graphics.xml index 79bd2bdefb..68f193a15f 100755 --- a/indra/newview/app_settings/mid_graphics.xml +++ b/indra/newview/app_settings/mid_graphics.xml @@ -29,7 +29,7 @@ <!--Avater Impostors and Visual Muting Limits--> <RenderAvatarMaxNonImpostors value="18"/> <RenderAvatarMaxComplexity value="100000"/> - <RenderAutoMuteSurfaceAreaLimit value="1.0E6"/> + <RenderAutoMuteSurfaceAreaLimit value="10.0E6"/> <!--Default for now--> <RenderVolumeLODFactor value="1.125"/> <!--NO SHADERS--> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 28942f388a..7ec9f778bf 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10036,7 +10036,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>1.0E6</real> + <real>10.0E6</real> </map> <key>RenderAutoMuteLogging</key> <map> @@ -10058,7 +10058,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>1.0E6</real> + <real>10.0E6</real> </map> <key>RenderVBOEnable</key> diff --git a/indra/newview/app_settings/ultra_graphics.xml b/indra/newview/app_settings/ultra_graphics.xml index a56bdffac7..a333634fea 100755 --- a/indra/newview/app_settings/ultra_graphics.xml +++ b/indra/newview/app_settings/ultra_graphics.xml @@ -30,7 +30,7 @@ based on default graphics setting --> <RenderAvatarMaxNonImpostors value="0"/> <RenderAvatarMaxComplexity value="0"/> - <RenderAutoMuteSurfaceAreaLimit value="1.0E6"/> + <RenderAutoMuteSurfaceAreaLimit value="10.0E6"/> <!--Default for now--> <RenderVolumeLODFactor value="2.0"/> <!--NO SHADERS--> |