livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-7819 - fix for gratuitous extra extended mesh flag setting

meow-7.2.2
Brad Payne (Vir Linden) 2017-09-25 21:56:40 +01:00
parent 8c38fc7b56
commit d69f1e18a7
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llvovolume.cpp
View File

@ -3439,12 +3439,14 @@ void LLVOVolume::updateAnimatedObjectState(LLViewerObject *old_parent, LLViewerO
// we may want to include or remove the isAvatar() check.
if (new_parent && !new_parent->isAvatar())
{
#if 0 // AXON - MAINT-7819
// Object should inherit control avatar and animated mesh flag
// from parent, so clear them out from our own state
if (getExtendedMeshFlags() & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG)
{
setExtendedMeshFlags(getExtendedMeshFlags() & ~LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG);
}
#endif
if (mControlAvatar.notNull())
{
LLControlAvatar *av = mControlAvatar;