Clean up impostors and visual muting

Rename the settings that control them to be more descriptive
Remove the separate boolean setting (RenderUseImpostors) that governed both
Establish default values based on gpu class for impostors and visual muting

5 files changed, 78 insertions, 46 deletions

diff --git a/indra/newview/app_settings/high_graphics.xml b/indra/newview/app_settings/high_graphics.xml
index 37def19aaa..4e7c0fa914 100755
--- a/indra/newview/app_settings/high_graphics.xml
+++ b/indra/newview/app_settings/high_graphics.xml
@@ -27,9 +27,8 @@
 	<!--Default for now-->
 	<RenderTreeLODFactor value="0.5"/>
 	<!--Avater Impostors and Visual Muting Limits-->
-	<RenderUseImpostors value="TRUE"/>
-    <RenderAvatarMaxVisible          value="20"/>
-    <RenderAutoMuteRenderWeightLimit value="350000"/>
+    <RenderAvatarMaxNonImpostors     value="20"/>
+    <RenderAvatarMaxComplexity              value="350000"/>
     <RenderAutoMuteSurfaceAreaLimit  value="300"/>
 	<!--Default for now-->
 	<RenderVolumeLODFactor value="1.125"/>
diff --git a/indra/newview/app_settings/low_graphics.xml b/indra/newview/app_settings/low_graphics.xml
index 683c2bd996..b98d681018 100755
--- a/indra/newview/app_settings/low_graphics.xml
+++ b/indra/newview/app_settings/low_graphics.xml
@@ -7,7 +7,7 @@
 	<!--Default for now-->
 	<RenderAvatarPhysicsLODFactor value="0.0"/>
 	<!--Default for now-->
-	<RenderAvatarMaxVisible value="3"/>
+	<RenderAvatarMaxNonImpostors value="10"/>
 	<!--NO SHADERS-->
 	<RenderAvatarVP value="FALSE"/>
 	<!--Short Range-->
@@ -29,9 +29,8 @@
 	<!--Default for now-->
 	<RenderTreeLODFactor value="0.5"/>
 	<!--Avater Impostors and Visual Muting Limits-->
-	<RenderUseImpostors value="TRUE"/>
-    <RenderAvatarMaxVisible          value="12"/>
-    <RenderAutoMuteRenderWeightLimit value="75000"/>
+    <RenderAvatarMaxNonImpostors     value="12"/>
+    <RenderAvatarMaxComplexity              value="75000"/>
     <RenderAutoMuteSurfaceAreaLimit  value="150"/>
 	<!--Default for now-->
 	<RenderVolumeLODFactor value="1.125"/>
diff --git a/indra/newview/app_settings/mid_graphics.xml b/indra/newview/app_settings/mid_graphics.xml
index f9b199c728..fad48f9683 100755
--- a/indra/newview/app_settings/mid_graphics.xml
+++ b/indra/newview/app_settings/mid_graphics.xml
@@ -27,9 +27,8 @@
 	<!--Default for now-->
 	<RenderTreeLODFactor value="0.5"/>
 	<!--Avater Impostors and Visual Muting Limits-->
-	<RenderUseImpostors value="TRUE"/>
-    <RenderAvatarMaxVisible          value="18"/>
-    <RenderAutoMuteRenderWeightLimit value="100000"/>
+    <RenderAvatarMaxNonImpostors     value="18"/>
+    <RenderAvatarMaxComplexity              value="100000"/>
     <RenderAutoMuteSurfaceAreaLimit  value="200"/>
 	<!--Default for now-->
 	<RenderVolumeLODFactor value="1.125"/>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0c5126574f..de81f8f0ee 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8287,15 +8287,13 @@
     <key>RenderAvatarMaxVisible</key>
     <map>
       <key>Comment</key>
-      <string>Maximum number of avatars to fully render at one time;
-      over this limit uses impostor rendering (simplified rendering
-      with less frequent updates)</string>
+      <string>OBSOLETE and UNUSED. See RenderAvatarMaxNonImpostors</string>
       <key>Persist</key>
-      <integer>1</integer>
+      <integer>0</integer>
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>12</integer>
+      <integer>0</integer>
     </map>
     <key>RenderAvatarPhysicsLODFactor</key>
     <map>
@@ -9846,29 +9844,28 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-    <key>RenderUseFarClip</key>
-    <map>
-      <key>Comment</key>
-      <string>If false, frustum culling will ignore far clip plane.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>RenderUseImpostors</key>
-    <map>
-      <key>Comment</key>
-      <string>Whether we want to use impostors for far away avatars.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-  
+  <key>RenderUseFarClip</key>
+  <map>
+    <key>Comment</key>
+    <string>If false, frustum culling will ignore far clip plane.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>RenderUseImpostors</key>
+  <map>
+    <key>Comment</key>
+    <string>OBSOLETE and UNUSED. See RenderAvatarMaxNonImpostors and RenderAvatarMaxComplexity.</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>RenderAutoMuteByteLimit</key>
   <map>
     <key>Comment</key>
@@ -9880,10 +9877,35 @@
     <key>Value</key>
     <integer>10000000</integer>
   </map>
+  <key>RenderAvatarMaxNonImpostors</key>
+  <map>
+    <key>Comment</key>
+    <string>Maximum number of avatars to fully render at one time;
+    over this limit uses impostor rendering (simplified rendering
+    with less frequent updates), reducing client lag.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>U32</string>
+    <key>Value</key>
+    <integer>12</integer>
+  </map>
   <key>RenderAutoMuteRenderWeightLimit</key>
   <map>
     <key>Comment</key>
-    <string>Maximum render weight before an avatar is rendered as a simple impostor (0 to not use this limit).</string>
+    <string>OBSOLETE. This setting has been renamed RenderAvatarMaxNonImpostors.</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>U32</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RenderAvatarMaxComplexity</key>
+  <map>
+    <key>Comment</key>
+    <string>Maximum Avatar Complexity; above this value, the avatar is
+    rendered as a solid color outline (0 to disable this limit).</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -15575,12 +15597,25 @@
       <key>Value</key>
       <string />
     </map>
-    <key>MaximumARC</key>
+    <key>IndirectMaxComplexity</key>
     <map>
       <key>Comment</key>
-      <string>Controls RenderAutoMuteRenderWeightLimit in a non-linear fashion</string>
+      <string>Controls RenderAvatarMaxComplexity in a non-linear fashion (do
+      not set this value)</string>
       <key>Persist</key>
-      <integer>1</integer>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>IndirectMaxNonImpostors</key>
+    <map>
+      <key>Comment</key>
+      <string>Controls RenderAvatarMaxNonImpostors in a non-linear fashion (do
+      not set this value)</string>
+      <key>Persist</key>
+      <integer>0</integer>
       <key>Type</key>
       <string>U32</string>
       <key>Value</key>
diff --git a/indra/newview/app_settings/ultra_graphics.xml b/indra/newview/app_settings/ultra_graphics.xml
index dcf63eced5..270f91aeeb 100755
--- a/indra/newview/app_settings/ultra_graphics.xml
+++ b/indra/newview/app_settings/ultra_graphics.xml
@@ -26,10 +26,10 @@
 	<RenderTerrainLODFactor value="2.0"/>
 	<!--Default for now-->
 	<RenderTreeLODFactor value="1.0"/>
-	<!--Avater Impostors and Visual Muting Limits-->
-	<RenderUseImpostors value="TRUE"/>
-    <RenderAvatarMaxVisible          value="0"/>
-    <RenderAutoMuteRenderWeightLimit value="0"/>
+	<!--Avater Impostors and Visual Muting Limits (real defaults set
+        based on default graphics setting -->
+    <RenderAvatarMaxNonImpostors     value="0"/>
+    <RenderAvatarMaxComplexity              value="0"/>
     <RenderAutoMuteSurfaceAreaLimit  value="10000"/>
 	<!--Default for now-->
 	<RenderVolumeLODFactor value="2.0"/>