livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for MAINT-5607

Oz Linden 2015-09-08 09:26:35 -04:00
parent 1db375773f 3677d35c3b
commit 50c374f4d1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llvoavatar.cpp
View File

@ -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