summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llkeyframefallmotion.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2021-12-26 14:01:06 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2021-12-26 14:01:06 +0200
commit747dbb7da2482ce00b15b268344ad1306ea850cf (patch)
treef6fb6731f8f851087d4d7011ca02e96d03187116 /indra/llcharacter/llkeyframefallmotion.cpp
parent8b3a19f19c3215c9d83d4d89c9c0a6a6e2ea3230 (diff)
parent0a873cd95547f003878c6d00d0883ff792f4a865 (diff)
Merge branch 'master' into DRTVWR-540-maint
Diffstat (limited to 'indra/llcharacter/llkeyframefallmotion.cpp')
-rw-r--r--indra/llcharacter/llkeyframefallmotion.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcharacter/llkeyframefallmotion.cpp b/indra/llcharacter/llkeyframefallmotion.cpp
index 60ab2e9929..7842f0e5fb 100644
--- a/indra/llcharacter/llkeyframefallmotion.cpp
+++ b/indra/llcharacter/llkeyframefallmotion.cpp
@@ -70,6 +70,11 @@ LLMotion::LLMotionInitStatus LLKeyframeFallMotion::onInitialize(LLCharacter *cha
// load keyframe data, setup pose and joint states
LLMotion::LLMotionInitStatus result = LLKeyframeMotion::onInitialize(character);
+ if (result != LLMotion::STATUS_SUCCESS)
+ {
+ return result;
+ }
+
for (U32 jm=0; jm<mJointMotionList->getNumJointMotions(); jm++)
{
if (!mJointStates[jm]->getJoint())