diff options
| -rwxr-xr-x | indra/newview/app_settings/high_graphics.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/app_settings/low_graphics.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/app_settings/mid_graphics.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 4 | ||||
| -rwxr-xr-x | indra/newview/app_settings/ultra_graphics.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/app_settings/high_graphics.xml b/indra/newview/app_settings/high_graphics.xml index deb58a4b58..f66ba3c4df 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="1.0E6"/> + <RenderAutoMuteSurfaceAreaLimit value="10.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 fcab574988..304e7c7347 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="1.0E6"/> + <RenderAutoMuteSurfaceAreaLimit value="10.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 79bd2bdefb..68f193a15f 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="1.0E6"/> + <RenderAutoMuteSurfaceAreaLimit value="10.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 9641165e8a..a6fa67cb9a 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10036,7 +10036,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>1.0E6</real> + <real>10.0E6</real> </map> <key>RenderAutoMuteLogging</key> <map> @@ -10058,7 +10058,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>1.0E6</real> + <real>10.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 a56bdffac7..a333634fea 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="1.0E6"/> + <RenderAutoMuteSurfaceAreaLimit value="10.0E6"/> <!--Default for now--> <RenderVolumeLODFactor value="2.0"/> <!--NO SHADERS--> diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index e65ae91cb6..3440cbe5df 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6486,7 +6486,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", 1.0E6f); + static LLCachedControl<F32> max_attachment_area(gSavedSettings, "RenderAutoMuteSurfaceAreaLimit", 10.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) @@ -8247,7 +8247,7 @@ void LLVOAvatar::idleUpdateRenderComplexity() mText->addLine(info_line, info_color, info_style); // Attachment Surface Area - static LLCachedControl<F32> max_attachment_area(gSavedSettings, "RenderAutoMuteSurfaceAreaLimit", 1.0E6f); + static LLCachedControl<F32> max_attachment_area(gSavedSettings, "RenderAutoMuteSurfaceAreaLimit", 10.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 |