summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2018-05-15 18:17:27 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2018-05-15 18:17:27 +0100
commit75ff54e56abb3e5e3854605e110af941e94df1a8 (patch)
tree89896a675b1e36ed5b003accdb3ab7d0a1371ee8 /indra
parentb42b0a9fb9b9aa777c73729f3313a0f1584def86 (diff)
MAINT-8652 - joint positions not applied right away for observers of animated objects
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llvovolume.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index e08379af09..e74d20a8ef 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5166,6 +5166,8 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
bool is_mesh = vobj->isMesh();
F32 est_tris = vobj->getEstTrianglesMax();
+ vobj->updateControlAvatar();
+
LL_DEBUGS("AnimatedObjectsLinkset") << vobj_name << " rebuilding, isAttachment: " << (U32) vobj->isAttachment()
<< " is_mesh " << is_mesh
<< " est_tris " << est_tris
@@ -5199,8 +5201,6 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
rigged = rigged || (vobj->isAnimatedObject() && vobj->isRiggedMesh() &&
vobj->getControlAvatar() && vobj->getControlAvatar()->mPlaying);
- vobj->updateControlAvatar();
-
bool bake_sunlight = LLPipeline::sBakeSunlight && drawablep->isStatic();
bool any_rigged_face = false;