diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-09-25 16:39:26 +0100 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-09-25 16:39:26 +0100 |
commit | 963945b3ab258ea445e1d9757fc5a89ce397ff7b (patch) | |
tree | e7b85e9884277c597856ecab3deecdc92aa6333e | |
parent | 301821337bf692d9f8d56230dc620efa74fcd275 (diff) |
SL-1291 - fixed some issues with selection highlighting of objects rezzed while in build mode. Not clear whether this addresses the original issue, which isn't reproing
-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); |