SL-18563 Pull featuretable settings for avatar impostors and volume lod from auto-fps viewer

2 files changed, 22 insertions, 10 deletions

diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 020c7bbc74..14d8d3fae5 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -1,4 +1,4 @@
-version 51
+version 52
 // The version number above should be incremented IF AND ONLY IF some
 // change has been made that is sufficiently important to justify
 // resetting the graphics preferences of all users to the recommended
@@ -109,6 +109,7 @@ RenderScreenSpaceReflections 1  0
 list LowMid
 RenderAnisotropic			1	0
 RenderAvatarLODFactor		1	0.5
+RenderAvatarMaxNonImpostors 1   5
 RenderAvatarMaxComplexity   1	100000
 RenderAvatarPhysicsLODFactor 1	0.75
 RenderFarClip				1	96
@@ -136,6 +137,7 @@ RenderScreenSpaceReflections 1  0
 list Mid
 RenderAnisotropic			1	1
 RenderAvatarLODFactor		1	1.0
+RenderAvatarMaxNonImpostors 1   7
 RenderAvatarMaxComplexity   1	200000
 RenderAvatarPhysicsLODFactor 1	1.0
 RenderFarClip				1	128
@@ -147,7 +149,7 @@ RenderTransparentWater      1   0
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
 RenderTreeLODFactor			1	0.5
-RenderVolumeLODFactor		1	1.125
+RenderVolumeLODFactor		1	1.25
 RenderDeferredSSAO			1	0
 RenderUseAdvancedAtmospherics 1 0
 RenderShadowDetail			1	0
@@ -163,6 +165,7 @@ RenderScreenSpaceReflections 1  0
 list MidHigh
 RenderAnisotropic			1	1
 RenderAvatarLODFactor		1	1.0
+RenderAvatarMaxNonImpostors 1   9
 RenderAvatarMaxComplexity   1	250000
 RenderAvatarPhysicsLODFactor 1	1.0
 RenderFarClip				1	128
@@ -174,7 +177,7 @@ RenderTransparentWater      1   1
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
 RenderTreeLODFactor			1	0.5
-RenderVolumeLODFactor		1	1.125
+RenderVolumeLODFactor		1	1.375
 RenderDeferredSSAO			1	0
 RenderUseAdvancedAtmospherics 1 0
 RenderShadowDetail			1	0
@@ -190,6 +193,7 @@ RenderScreenSpaceReflections 1  0
 list High
 RenderAnisotropic			1	1
 RenderAvatarLODFactor		1	1.0
+RenderAvatarMaxNonImpostors 1   11
 RenderAvatarMaxComplexity   1	300000
 RenderAvatarPhysicsLODFactor 1	1.0
 RenderFarClip				1	128
@@ -201,7 +205,7 @@ RenderTransparentWater      1   1
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
 RenderTreeLODFactor			1	0.5
-RenderVolumeLODFactor		1	1.125
+RenderVolumeLODFactor		1	1.5
 RenderDeferredSSAO			1	1
 RenderUseAdvancedAtmospherics 1 0
 RenderShadowDetail			1	0
@@ -217,6 +221,7 @@ RenderScreenSpaceReflections 1  0
 list HighUltra
 RenderAnisotropic			1	1
 RenderAvatarLODFactor		1	1.0
+RenderAvatarMaxNonImpostors 1   16
 RenderAvatarMaxComplexity   1	350000
 RenderAvatarPhysicsLODFactor 1	1.0
 RenderFarClip				1	128
@@ -228,7 +233,7 @@ RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
-RenderVolumeLODFactor		1	1.125
+RenderVolumeLODFactor		1	1.75
 RenderDeferredSSAO			1	1
 RenderUseAdvancedAtmospherics 1 0
 RenderShadowDetail			1	2
@@ -244,6 +249,7 @@ RenderScreenSpaceReflections 1  0
 list Ultra
 RenderAnisotropic			1	1
 RenderAvatarLODFactor		1	1.0
+RenderAvatarMaxNonImpostors 1   16
 RenderAvatarPhysicsLODFactor 1	1.0
 RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index dbb33b3997..b7a0ac6e28 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 46
+version 47
 // The version number above should be incremented IF AND ONLY IF some
 // change has been made that is sufficiently important to justify
 // resetting the graphics preferences of all users to the recommended
@@ -107,6 +107,7 @@ RenderScreenSpaceReflections 1  0
 list LowMid
 RenderAnisotropic			1	0
 RenderAvatarLODFactor		1	0.5
+RenderAvatarMaxNonImpostors 1   5
 RenderAvatarMaxComplexity   1	100000
 RenderAvatarPhysicsLODFactor 1	0.75
 RenderFarClip				1	96
@@ -134,6 +135,7 @@ RenderScreenSpaceReflections 1  0
 list Mid
 RenderAnisotropic			1	1
 RenderAvatarLODFactor		1	1.0
+RenderAvatarMaxNonImpostors 1   7
 RenderAvatarMaxComplexity   1	200000
 RenderAvatarPhysicsLODFactor 1	1.0
 RenderFarClip				1	128
@@ -145,7 +147,7 @@ RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
-RenderVolumeLODFactor		1	1.125
+RenderVolumeLODFactor		1	1.25
 RenderDeferredSSAO			1	0
 RenderUseAdvancedAtmospherics 1 0
 RenderShadowDetail			1	0
@@ -161,6 +163,7 @@ RenderScreenSpaceReflections 1  0
 list MidHigh
 RenderAnisotropic			1	1
 RenderAvatarLODFactor		1	1.0
+RenderAvatarMaxNonImpostors 1   9
 RenderAvatarMaxComplexity   1	250000
 RenderAvatarPhysicsLODFactor 1	1.0
 RenderFarClip				1	128
@@ -172,7 +175,7 @@ RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
-RenderVolumeLODFactor		1	1.125
+RenderVolumeLODFactor		1	1.375
 RenderDeferredSSAO			1	0
 RenderUseAdvancedAtmospherics 1 0
 RenderShadowDetail			1	0
@@ -188,6 +191,7 @@ RenderScreenSpaceReflections 1  0
 list High
 RenderAnisotropic			1	1
 RenderAvatarLODFactor		1	1.0
+RenderAvatarMaxNonImpostors 1   11
 RenderAvatarMaxComplexity   1	300000
 RenderAvatarPhysicsLODFactor 1	1.0
 RenderFarClip				1	128
@@ -199,7 +203,7 @@ RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
-RenderVolumeLODFactor		1	1.125
+RenderVolumeLODFactor		1	1.5
 RenderDeferredSSAO			1	1
 RenderUseAdvancedAtmospherics 1 0
 RenderShadowDetail			1	0
@@ -215,6 +219,7 @@ RenderScreenSpaceReflections 1  0
 list HighUltra
 RenderAnisotropic			1	1
 RenderAvatarLODFactor		1	1.0
+RenderAvatarMaxNonImpostors 1   16
 RenderAvatarMaxComplexity   1	350000
 RenderAvatarPhysicsLODFactor 1	1.0
 RenderFarClip				1	128
@@ -226,7 +231,7 @@ RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
-RenderVolumeLODFactor		1	1.125
+RenderVolumeLODFactor		1	1.75
 RenderDeferredSSAO			1	1
 RenderShadowDetail			1	2
 RenderUseAdvancedAtmospherics 1 0
@@ -242,6 +247,7 @@ RenderScreenSpaceReflections 1  0
 list Ultra
 RenderAnisotropic			1	1
 RenderAvatarLODFactor		1	1.0
+RenderAvatarMaxNonImpostors 1   16
 RenderAvatarPhysicsLODFactor 1	1.0
 RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0