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

SL-797 - boost ARC by 20K for each attached animated object. Placeholder value to be revised after testing.

meow-7.2.2
Brad Payne (Vir Linden) 2017-09-22 22:03:07 +01:00
parent a6068419e7
commit 8c38fc7b56
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llvoavatar.cpp
View File

@ -9165,6 +9165,12 @@ void LLVOAvatar::updateImpostorRendering(U32 newMaxNonImpostorsValue)
void LLVOAvatar::idleUpdateRenderComplexity()
{
if (isControlAvatar())
{
// ARC for animated object attachments is accounted with the avatar they're attached to.
return;
}
// Render Complexity
calculateUpdateRenderComplexity(); // Update mVisualComplexity if needed
@ -9319,7 +9325,13 @@ void LLVOAvatar::calculateUpdateRenderComplexity()
F32 attachment_volume_cost = 0;
F32 attachment_texture_cost = 0;
F32 attachment_children_cost = 0;
// AXON placeholder value, will revisit in testing.
const F32 animated_object_attachment_surcharge = 20000;
if (attached_object->isAnimatedObject())
{
attachment_volume_cost += animated_object_attachment_surcharge;
}
attachment_volume_cost += volume->getRenderCost(textures);
const_child_list_t children = volume->getChildren();

4
indra/newview/llvovolume.cpp
View File

@ -3340,6 +3340,10 @@ void LLVOVolume::setExtendedMeshFlags(U32 flags)
param_block->setFlags(flags);
}
parameterChanged(LLNetworkData::PARAMS_EXTENDED_MESH, true);
if (isAttachment() && getAvatarAncestor())
{
getAvatarAncestor()->updateVisualComplexity();
}
}
}