summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llkeyframemotion.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-11-16 08:39:41 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-11-16 08:39:41 -0500
commitd31596db6a6c5f7ef8c57bfaa42496db4a9b471e (patch)
treea107255826e044a4ef23ff6328e8468a39cb5995 /indra/llcharacter/llkeyframemotion.cpp
parentde487038fc034c470a21e9d6c5bf78e5085ae4a2 (diff)
parentecd93e56781498ef73ea2a3d5be0c449179b6a0a (diff)
merge
Diffstat (limited to 'indra/llcharacter/llkeyframemotion.cpp')
-rw-r--r--indra/llcharacter/llkeyframemotion.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index d16c2731b3..89f34a92c8 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -2243,7 +2243,7 @@ void LLKeyframeMotion::onLoadComplete(LLVFS *vfs,
LLCharacter* character = *char_iter;
// look for an existing instance of this motion
- LLKeyframeMotion* motionp = (LLKeyframeMotion*) character->findMotion(asset_uuid);
+ LLKeyframeMotion* motionp = dynamic_cast<LLKeyframeMotion*> (character->findMotion(asset_uuid));
if (motionp)
{
if (0 == status)