From 75ff54e56abb3e5e3854605e110af941e94df1a8 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 15 May 2018 18:17:27 +0100
Subject: [PATCH] MAINT-8652 - joint positions not applied right away for
observers of animated objects
---
indra/newview/llvovolume.cpp | 4 ++--
1 file 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;
--
GitLab