diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-10-04 13:54:24 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-10-04 13:54:24 +0100 |
| commit | 497a4109d809f7aa5818d5c5dfecb7ca8cf3b1f9 (patch) | |
| tree | 86dc9b0f095e3178c68129ece140ff602f009e36 /indra/newview | |
| parent | 36c44242133697611216375c94d637ef88cd66cc (diff) | |
SL-808 - direct area calculation matches indirect accumulation approach
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index e849e14a5b..d2a413b073 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -9238,7 +9238,10 @@ void LLVOAvatar::idleUpdateRenderComplexity() // Attachment Surface Area static LLCachedControl<F32> max_attachment_area(gSavedSettings, "RenderAutoMuteSurfaceAreaLimit", 1000.0f); - info_line = llformat("%.0f m^2 (%.0f)", mAttachmentSurfaceArea, mDirectAttachmentSurfaceArea); + // AXON we can consolidate mAttachmentSurfaceArea and + // mDirectAttachmentSurfaceArea once QA establishes + // equivalence. + info_line = llformat("%.0f m^2", mDirectAttachmentSurfaceArea); if (max_render_cost != 0 && max_attachment_area != 0) // zero means don't care, so don't bother coloring based on this { @@ -9354,6 +9357,8 @@ void LLVOAvatar::accountRenderComplexityForObject( { textures.clear(); + mDirectAttachmentSurfaceArea += attached_object->recursiveGetScaledSurfaceArea(); + const LLVOVolume* volume = attached_object->mDrawable->getVOVolume(); if (volume) { |