diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-09-08 09:26:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-09-08 09:26:35 -0400 |
| commit | 50c374f4d1585d82c81639afc0d28ae8a7bd7de9 (patch) | |
| tree | 4d05f04e4439bf7328c930a9afdb7133740a120d | |
| parent | 1db375773f71506116133ffe235938b87dd62cec (diff) | |
| parent | 3677d35c3b5a6fe60498f9319295079867bd170d (diff) | |
merge changes for MAINT-5607
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 3116aefaed..c5a6868502 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6465,7 +6465,7 @@ BOOL LLVOAvatar::isFullyLoaded() const bool LLVOAvatar::isTooComplex() const { bool too_complex; - if (isSelf()) + if (isSelf() || mVisuallyMuteSetting == AV_ALWAYS_RENDER) { too_complex = false; } @@ -6477,12 +6477,11 @@ bool LLVOAvatar::isTooComplex() const static LLCachedControl<F32> max_attachment_area(gSavedSettings, "RenderAutoMuteSurfaceAreaLimit", 0.0f); too_complex = ((max_render_cost > 0 && mVisualComplexity > max_render_cost) || (max_attachment_bytes > 0 && mAttachmentGeometryBytes > max_attachment_bytes) - || (max_attachment_area > 0.f && mAttachmentSurfaceArea > max_attachment_area) + || (max_attachment_area > 0.0f && mAttachmentSurfaceArea > max_attachment_area) ); } return too_complex; - } //----------------------------------------------------------------------------- @@ -8242,7 +8241,7 @@ void LLVOAvatar::idleUpdateRenderComplexity() mText->addLine(info_line, info_color, info_style); // Attachment Surface Area - static LLCachedControl<F32> max_attachment_area(gSavedSettings, "RenderAutoMuteSurfaceAreaLimit", 0); + static LLCachedControl<F32> max_attachment_area(gSavedSettings, "RenderAutoMuteSurfaceAreaLimit", 0.0f); 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 |