From a976c9f502723649c7d74ddfd4e0c61c17a38e15 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 29 Jan 2015 11:54:28 -0500
Subject: [PATCH] add default values (some sensitive to graphics setting) for
avatar rendering limits
---
indra/newview/app_settings/high_graphics.xml | 5 ++++-
indra/newview/app_settings/low_graphics.xml | 5 ++++-
indra/newview/app_settings/mid_graphics.xml | 5 ++++-
indra/newview/app_settings/settings.xml | 8 +++++---
indra/newview/app_settings/ultra_graphics.xml | 5 ++++-
5 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/indra/newview/app_settings/high_graphics.xml b/indra/newview/app_settings/high_graphics.xml
index 5bc2e1b7e64..37def19aaa0 100755
--- a/indra/newview/app_settings/high_graphics.xml
+++ b/indra/newview/app_settings/high_graphics.xml
@@ -26,8 +26,11 @@
<RenderTerrainLODFactor value="2"/>
<!--Default for now-->
<RenderTreeLODFactor value="0.5"/>
- <!--Try Impostors-->
+ <!--Avater Impostors and Visual Muting Limits-->
<RenderUseImpostors value="TRUE"/>
+ <RenderAvatarMaxVisible value="20"/>
+ <RenderAutoMuteRenderWeightLimit value="350000"/>
+ <RenderAutoMuteSurfaceAreaLimit value="300"/>
<!--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 ca1dae0b86d..683c2bd996f 100755
--- a/indra/newview/app_settings/low_graphics.xml
+++ b/indra/newview/app_settings/low_graphics.xml
@@ -28,8 +28,11 @@
<RenderTerrainLODFactor value="1.0"/>
<!--Default for now-->
<RenderTreeLODFactor value="0.5"/>
- <!--Try Impostors-->
+ <!--Avater Impostors and Visual Muting Limits-->
<RenderUseImpostors value="TRUE"/>
+ <RenderAvatarMaxVisible value="12"/>
+ <RenderAutoMuteRenderWeightLimit value="75000"/>
+ <RenderAutoMuteSurfaceAreaLimit value="150"/>
<!--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 01822fe64c9..f9b199c7287 100755
--- a/indra/newview/app_settings/mid_graphics.xml
+++ b/indra/newview/app_settings/mid_graphics.xml
@@ -26,8 +26,11 @@
<RenderTerrainLODFactor value="1.0"/>
<!--Default for now-->
<RenderTreeLODFactor value="0.5"/>
- <!--Try Impostors-->
+ <!--Avater Impostors and Visual Muting Limits-->
<RenderUseImpostors value="TRUE"/>
+ <RenderAvatarMaxVisible value="18"/>
+ <RenderAutoMuteRenderWeightLimit value="100000"/>
+ <RenderAutoMuteSurfaceAreaLimit value="200"/>
<!--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 276a65edc5c..b78cb01d854 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8298,7 +8298,9 @@
<key>RenderAvatarMaxVisible</key>
<map>
<key>Comment</key>
- <string>Maximum number of avatars to display at any one time</string>
+ <string>Maximum number of avatars to fully render at one time;
+ over this limit uses impostor rendering (simplified rendering
+ with less frequent updates)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -9887,7 +9889,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>10000000</integer>
</map>
<key>RenderAutoMuteRenderWeightLimit</key>
<map>
@@ -9931,7 +9933,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>1.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 71459e5470a..dcf63eced5f 100755
--- a/indra/newview/app_settings/ultra_graphics.xml
+++ b/indra/newview/app_settings/ultra_graphics.xml
@@ -26,8 +26,11 @@
<RenderTerrainLODFactor value="2.0"/>
<!--Default for now-->
<RenderTreeLODFactor value="1.0"/>
- <!--Try Impostors-->
+ <!--Avater Impostors and Visual Muting Limits-->
<RenderUseImpostors value="TRUE"/>
+ <RenderAvatarMaxVisible value="0"/>
+ <RenderAutoMuteRenderWeightLimit value="0"/>
+ <RenderAutoMuteSurfaceAreaLimit value="10000"/>
<!--Default for now-->
<RenderVolumeLODFactor value="2.0"/>
<!--NO SHADERS-->
--
GitLab