diff options
| author | Scott Lawrence <oz@lindenlab.com> | 2015-09-14 14:48:56 -0400 |
|---|---|---|
| committer | Scott Lawrence <oz@lindenlab.com> | 2015-09-14 14:48:56 -0400 |
| commit | e59685e692fee451680fc4991f01d7a1a2117e6a (patch) | |
| tree | a28b983e0f8ab785a5ee07c73975f7d4c3a901e0 /indra/newview | |
| parent | eee96e653110438729f64718c151598dfa1976cf (diff) | |
| parent | 6e136a79c74a2f67b874d866cdb1be91653c6846 (diff) | |
Merged in andreykproductengine/weight-notification (pull request #2)
MAINT-5632 Max number of non-impostors should default to 3
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/app_settings/low_graphics.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/featuretable.txt | 4 | ||||
| -rwxr-xr-x | indra/newview/featuretable_mac.txt | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/app_settings/low_graphics.xml b/indra/newview/app_settings/low_graphics.xml index b98d681018..7ad8c7130b 100755 --- a/indra/newview/app_settings/low_graphics.xml +++ b/indra/newview/app_settings/low_graphics.xml @@ -6,8 +6,6 @@ <RenderAvatarLODFactor value="0.5"/> <!--Default for now--> <RenderAvatarPhysicsLODFactor value="0.0"/> - <!--Default for now--> - <RenderAvatarMaxNonImpostors value="10"/> <!--NO SHADERS--> <RenderAvatarVP value="FALSE"/> <!--Short Range--> diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 95a841193d..3b58b943cf 100755 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -80,7 +80,7 @@ RenderAnisotropic 1 0 RenderAvatarCloth 1 0 RenderAvatarLODFactor 1 0 RenderAvatarPhysicsLODFactor 1 0 -RenderAvatarMaxNonImpostors 1 12 +RenderAvatarMaxNonImpostors 1 3 RenderAvatarMaxComplexity 1 35000 RenderAvatarVP 1 0 RenderFarClip 1 64 @@ -111,7 +111,7 @@ RenderAnisotropic 1 0 RenderAvatarCloth 1 0 RenderAvatarLODFactor 1 0 RenderAvatarPhysicsLODFactor 1 0 -RenderAvatarMaxNonImpostors 1 12 +RenderAvatarMaxNonImpostors 1 3 RenderAvatarMaxComplexity 1 35000 RenderAvatarVP 1 0 RenderFarClip 1 64 diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index 23cb7e1ec8..024aab83dd 100755 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -80,7 +80,7 @@ RenderAnisotropic 1 0 RenderAvatarCloth 1 0 RenderAvatarLODFactor 1 0 RenderAvatarPhysicsLODFactor 1 0 -RenderAvatarMaxNonImpostors 1 12 +RenderAvatarMaxNonImpostors 1 3 RenderAvatarMaxComplexity 1 30000 RenderAvatarVP 1 0 RenderFarClip 1 64 @@ -111,7 +111,7 @@ RenderAnisotropic 1 0 RenderAvatarCloth 1 0 RenderAvatarLODFactor 1 0 RenderAvatarPhysicsLODFactor 1 0 -RenderAvatarMaxNonImpostors 1 12 +RenderAvatarMaxNonImpostors 1 3 RenderAvatarMaxComplexity 1 30000 RenderAvatarVP 1 0 RenderFarClip 1 64 |