summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2018-04-30 14:15:21 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2018-04-30 14:15:21 +0100
commit0dc944bd4a9aa48582ee0196a55c2759806acc64 (patch)
tree623aa2bcf33ca7941a3d043a625497709da2b1be /indra
parent09f40ee736f43781d5048cdd6883b8801a9ef448 (diff)
SL-908 - more reliable mesh highlighting
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerobject.cpp17
1 files changed, 13 insertions, 4 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 11d64ab13a..1cd50e3400 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3010,11 +3010,20 @@ void LLViewerObject::linkControlAvatar()
<< " created control av for "
<< (S32) (1+volp->numChildren()) << " prims" << LL_ENDL;
}
- if (getControlAvatar())
+ LLControlAvatar *cav = getControlAvatar();
+ if (cav)
{
- getControlAvatar()->updateAttachmentOverrides();
- getControlAvatar()->updateAnimations();
- getControlAvatar()->mPlaying = true;
+ cav->updateAttachmentOverrides();
+ cav->updateAnimations();
+ if (!cav->mPlaying)
+ {
+ cav->mPlaying = true;
+ if (!cav->mRootVolp->isAnySelected())
+ {
+ cav->updateVolumeGeom();
+ cav->mRootVolp->recursiveMarkForUpdate(TRUE);
+ }
+ }
}
else
{