diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2021-12-15 17:06:24 -0800 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2021-12-15 17:06:24 -0800 |
| commit | 1e6caa69e6576a87bb0b1b782bffdd0697fa0c2d (patch) | |
| tree | 38f8f0136381a2e7f2b8fcba82d9781bdfab9273 /indra/llcharacter/llkeyframefallmotion.cpp | |
| parent | 95e2f6286c140b6d3a7562a7e73f70d0ab60685b (diff) | |
| parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) | |
Merge remote-tracking branch 'origin/master' into brad/DRTVWR-550-mfa
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()) |