summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 166fc04ad0..725f48f091 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2993,6 +2993,10 @@ void LLViewerObject::updateControlAvatar()
LL_DEBUGS("AnimatedObjects") << vobj_name << " calling unlinkControlAvatar()" << LL_ENDL;
root->unlinkControlAvatar();
}
+ if (getControlAvatar())
+ {
+ getControlAvatar()->updateAnimations();
+ }
}
void LLViewerObject::linkControlAvatar()
@@ -3024,7 +3028,7 @@ void LLViewerObject::linkControlAvatar()
cav->mRootVolp->recursiveMarkForUpdate(TRUE);
}
}
- cav->updateAnimations();
+ //cav->updateAnimations();
}
else
{