From e1ce065b8b2f4a01a166ddd90ef7c873e04d0893 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 25 Sep 2015 16:10:11 -0400
Subject: MAINT-5673: set correct default for RenderAutoMuteSurfaceAreaLimit

---
 indra/newview/app_settings/high_graphics.xml  | 2 +-
 indra/newview/app_settings/low_graphics.xml   | 2 +-
 indra/newview/app_settings/mid_graphics.xml   | 2 +-
 indra/newview/app_settings/settings.xml       | 2 +-
 indra/newview/app_settings/ultra_graphics.xml | 2 +-
 indra/newview/llvoavatar.cpp                  | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/indra/newview/app_settings/high_graphics.xml b/indra/newview/app_settings/high_graphics.xml
index 4e7c0fa914..deb58a4b58 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="300"/>
+    <RenderAutoMuteSurfaceAreaLimit  value="1.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 7ad8c7130b..fcab574988 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="150"/>
+    <RenderAutoMuteSurfaceAreaLimit  value="1.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 fad48f9683..79bd2bdefb 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="200"/>
+    <RenderAutoMuteSurfaceAreaLimit  value="1.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 f33ebb40c2..4f1b5ba0dc 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10003,7 +10003,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>0.0</real>
+    <real>1.0E6</real>
   </map>
   <key>RenderAutoMuteLogging</key>
   <map>
diff --git a/indra/newview/app_settings/ultra_graphics.xml b/indra/newview/app_settings/ultra_graphics.xml
index 270f91aeeb..a56bdffac7 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="10000"/>
+    <RenderAutoMuteSurfaceAreaLimit  value="1.0E6"/>
 	<!--Default for now-->
 	<RenderVolumeLODFactor value="2.0"/>
 	<!--NO SHADERS-->
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 552a9f6b28..4546da71cc 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -6484,7 +6484,7 @@ bool LLVOAvatar::isTooComplex() const
 		// Determine if visually muted or not
 		static LLCachedControl<U32> max_render_cost(gSavedSettings, "RenderAvatarMaxComplexity", 0U);
 		static LLCachedControl<U32> max_attachment_bytes(gSavedSettings, "RenderAutoMuteByteLimit", 0U);
-		static LLCachedControl<F32> max_attachment_area(gSavedSettings, "RenderAutoMuteSurfaceAreaLimit", 0.0f);
+		static LLCachedControl<F32> max_attachment_area(gSavedSettings, "RenderAutoMuteSurfaceAreaLimit", 1.0E6f);
 		too_complex = ((max_render_cost > 0 && mVisualComplexity > max_render_cost)
 			|| (max_attachment_bytes > 0 && mAttachmentGeometryBytes > max_attachment_bytes)
 			|| (max_attachment_area > 0.0f && mAttachmentSurfaceArea > max_attachment_area)
@@ -8245,7 +8245,7 @@ void LLVOAvatar::idleUpdateRenderComplexity()
 		mText->addLine(info_line, info_color, info_style);
 
 		// Attachment Surface Area
-		static LLCachedControl<F32> max_attachment_area(gSavedSettings, "RenderAutoMuteSurfaceAreaLimit", 0.0f);
+		static LLCachedControl<F32> max_attachment_area(gSavedSettings, "RenderAutoMuteSurfaceAreaLimit", 1.0E6f);
 		info_line = llformat("%.2f m^2", mAttachmentSurfaceArea);
 
 		if (max_attachment_area != 0) // zero means don't care, so don't bother coloring based on this
-- 
cgit v1.2.3