summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llkeyframefallmotion.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2021-12-20 15:35:59 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2021-12-20 15:36:23 +0200
commitd91606b354e1b8dc570a6dd42c4c8d0b3566088f (patch)
tree63d2efe2731af4478ca81e89ddd5839a998e9622 /indra/llcharacter/llkeyframefallmotion.cpp
parent2112abac1bed6155aa8e2b1dcb768db009639d74 (diff)
parent0a873cd95547f003878c6d00d0883ff792f4a865 (diff)
Merge branch 'master' into DRTVWR-544-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())