diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-12-15 20:34:49 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-12-15 20:34:49 +0000 |
| commit | 0cb712af5cc8be9025fce82eac65408fab759505 (patch) | |
| tree | 0361f80565053ec2183277eeb73c6c6dbf8d06f6 /indra/llcharacter/llkeyframefallmotion.cpp | |
| parent | 101e282ca3d0e8ca0bf10b32a2a4b6362bc66b80 (diff) | |
| parent | e27f9551e1cae0f3fca22989bcbd256a876fd80d (diff) | |
Merged in DV528-merge-6.5.2 (pull request #813)
DRTVWR-528 merge up to 6.5.2
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()) |