diff options
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rw-r--r-- | indra/newview/llvovolume.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 094b0b77dd..9f8c8aba74 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3530,7 +3530,7 @@ void LLVOVolume::afterReparent() // notifyMeshLoaded() not being called reliably enough. // was: getControlAvatar()->addAttachmentOverridesForObject(this); - getControlAvatar()->rebuildAttachmentOverrides(); + //getControlAvatar()->rebuildAttachmentOverrides(); getControlAvatar()->updateAnimations(); } else @@ -5152,6 +5152,11 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) drawablep->clearState(LLDrawable::HAS_ALPHA); + if (vobj->isRiggedMesh() && vobj->getAvatar()) + { + vobj->getAvatar()->addAttachmentOverridesForObject(vobj); + } + // Standard rigged mesh attachments: bool rigged = !vobj->isAnimatedObject() && vobj->isRiggedMesh() && vobj->isAttachment(); // Animated objects. Have to check for isRiggedMesh() to |