diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-02-02 20:32:43 +0000 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-02-02 20:32:43 +0000 |
| commit | 9af10a84cf0671d04e844299456d4bc48d1dec45 (patch) | |
| tree | db2dfec5bf22271467f3772b2b662e300dc72f32 /indra/newview/llvovolume.cpp | |
| parent | 3a8b1bf1e4b30e8efb1fe161706c8d5f41fccad8 (diff) | |
MAINT-8239 - problems with some instances failing to load some joint positions. Added DumpXML and Reset Skeleton support for animated objects when debugging.
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 3d1cfcfa6b..8fcb498fca 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -324,8 +324,8 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys, sculpt_id = sculpt_params->getSculptTexture(); sculpt_type = sculpt_params->getSculptType(); - LL_DEBUGS("AnimatedObjects") << "uuid " << mID << " set sculpt_id " << sculpt_id << LL_ENDL; - dumpStack("AnimatedObjectsStack"); + LL_DEBUGS("ObjectUpdate") << "uuid " << mID << " set sculpt_id " << sculpt_id << LL_ENDL; + dumpStack("ObjectUpdateStack"); } if (!dp) @@ -3467,12 +3467,26 @@ void LLVOVolume::onReparent(LLViewerObject *old_parent, LLViewerObject *new_pare // virtual void LLVOVolume::afterReparent() { - // If this succeeds now, it's because the new parent is an animated object + { + LL_DEBUGS("AnimatedObjects") << "new child added for parent " + << ((LLViewerObject*)getParent())->getID() << LL_ENDL; + } + if (isAnimatedObject() && getControlAvatar()) { - getControlAvatar()->addAttachmentOverridesForObject(this); + LL_DEBUGS("AnimatedObjects") << "adding attachment overrides, parent is animated object" + << ((LLViewerObject*)getParent())->getID() << LL_ENDL; + //getControlAvatar()->addAttachmentOverridesForObject(this); + getControlAvatar()->rebuildAttachmentOverrides(); getControlAvatar()->updateAnimations(); } + else + { + LL_DEBUGS("AnimatedObjects") << "not adding overrides, parent: " + << ((LLViewerObject*)getParent())->getID() + << " isAnimated: " << isAnimatedObject() << " cav " + << getControlAvatar() << LL_ENDL; + } } //---------------------------------------------------------------------------- |