diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-05-04 15:04:42 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-05-04 15:04:42 +0100 |
| commit | 2f209465dc1adc33b2135d685a88190e83952012 (patch) | |
| tree | 4467c2007f456762d5e1cf7be7d766520371c225 /indra | |
| parent | 7ed17b5c2c11b9e57316c87b29524b88edb8f762 (diff) | |
MAINT-8608 - more on animation updates
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llcontrolavatar.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp index f298a8884b..c977f3784f 100644 --- a/indra/newview/llcontrolavatar.cpp +++ b/indra/newview/llcontrolavatar.cpp @@ -367,6 +367,7 @@ void LLControlAvatar::updateAnimations() for (std::vector<LLVOVolume*>::iterator vol_it = volumes.begin(); vol_it != volumes.end(); ++vol_it) { LLVOVolume *volp = *vol_it; + LL_INFOS("AnimatedObjects") << "updating anim for vol " << volp->getID() << " root " << mRootVolp->getID() << LL_ENDL; signaled_animation_map_t& signaled_animations = LLObjectSignaledAnimationMap::instance().getMap()[volp->getID()]; for (std::map<LLUUID,S32>::iterator anim_it = signaled_animations.begin(); anim_it != signaled_animations.end(); @@ -383,6 +384,7 @@ void LLControlAvatar::updateAnimations() // Animation not already present, use this sequence id. anims[anim_it->first] = anim_it->second; } + LL_INFOS("AnimatedObjects") << "found anim for vol " << volp->getID() << " anim " << anim_it->first << " root " << mRootVolp->getID() << LL_ENDL; } } if (!mPlaying) diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 166fc04ad0..725f48f091 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2993,6 +2993,10 @@ void LLViewerObject::updateControlAvatar() LL_DEBUGS("AnimatedObjects") << vobj_name << " calling unlinkControlAvatar()" << LL_ENDL; root->unlinkControlAvatar(); } + if (getControlAvatar()) + { + getControlAvatar()->updateAnimations(); + } } void LLViewerObject::linkControlAvatar() @@ -3024,7 +3028,7 @@ void LLViewerObject::linkControlAvatar() cav->mRootVolp->recursiveMarkForUpdate(TRUE); } } - cav->updateAnimations(); + //cav->updateAnimations(); } else { |