summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-09-26 14:35:43 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-09-26 14:35:43 +0100
commit59e0c9be7137cfc9a6aec635acc9c0da9e854a24 (patch)
tree99aa3ae34c4150667b33e5d4c6c9066f1bd12cf0 /indra
parentd69f1e18a7838fc2301c39e5b7a2a01b987c94f6 (diff)
SL-800 - remove attachment pos overrides from avatar when an attached rigged mesh becomes an animated object
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llvovolume.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 0b338a81a5..e8122c0748 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3343,6 +3343,11 @@ void LLVOVolume::setExtendedMeshFlags(U32 flags)
if (isAttachment() && getAvatarAncestor())
{
getAvatarAncestor()->updateVisualComplexity();
+ if (flags & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG)
+ {
+ // Making a rigged mesh into an animated object
+ getAvatarAncestor()->removeAttachmentOverridesForObject(this);
+ }
}
}
}