diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llcontrolavatar.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp index 96cdb7f01d..0efed8ab7c 100644 --- a/indra/newview/llcontrolavatar.cpp +++ b/indra/newview/llcontrolavatar.cpp @@ -508,7 +508,7 @@ void LLControlAvatar::updateAnimations() if (!mPlaying) { mPlaying = true; - if (!mRootVolp->isAnySelected()) + //if (!mRootVolp->isAnySelected()) { updateVolumeGeom(); mRootVolp->recursiveMarkForUpdate(TRUE); diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index dc11bc28e5..b74c5b9b8a 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4049,7 +4049,7 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data) if (!avatarp->mPlaying) { avatarp->mPlaying = true; - if (!avatarp->mRootVolp->isAnySelected()) + //if (!avatarp->mRootVolp->isAnySelected()) { avatarp->updateVolumeGeom(); avatarp->mRootVolp->recursiveMarkForUpdate(TRUE); diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index f963f8a0c8..dcd09f66c7 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -3015,6 +3015,10 @@ void LLViewerObject::updateControlAvatar() if (getControlAvatar()) { getControlAvatar()->updateAnimations(); + if (isSelected()) + { + LLSelectMgr::getInstance()->pauseAssociatedAvatars(); + } } } @@ -3040,7 +3044,7 @@ void LLViewerObject::linkControlAvatar() if (!cav->mPlaying) { cav->mPlaying = true; - if (!cav->mRootVolp->isAnySelected()) + //if (!cav->mRootVolp->isAnySelected()) { cav->updateVolumeGeom(); cav->mRootVolp->recursiveMarkForUpdate(TRUE); |