diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:42:32 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:42:32 +0200 |
commit | 9ba43b5ce9c480ab84adabdf85536c9c14186c05 (patch) | |
tree | f39554d3a7579fcd42fa686927ec6f84c2938a0e /indra/llcharacter/llkeyframefallmotion.cpp | |
parent | 806345951bcb72ae709cc19a198f78905fcbdb46 (diff) | |
parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) |
Merge branch 'master' into DRTVWR-521-maint
Diffstat (limited to 'indra/llcharacter/llkeyframefallmotion.cpp')
-rw-r--r-- | indra/llcharacter/llkeyframefallmotion.cpp | 5 |
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()) |