diff options
| author | Jon Wolk <jwolk@lindenlab.com> | 2008-01-24 21:11:28 +0000 |
|---|---|---|
| committer | Jon Wolk <jwolk@lindenlab.com> | 2008-01-24 21:11:28 +0000 |
| commit | ed517c3b1440145aaf7226c1ac8270f20509f708 (patch) | |
| tree | fefc8447366f54b4aa3053561bf6dd899612e6f1 /indra/llcharacter/llkeyframemotion.cpp | |
| parent | c48ebd889b3baa6adf051e3b114052291ac72603 (diff) | |
svn merge -r 77416:78126 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer_abandoned -> release
Diffstat (limited to 'indra/llcharacter/llkeyframemotion.cpp')
| -rw-r--r-- | indra/llcharacter/llkeyframemotion.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp index 44a2425b1b..76fa0b93ee 100644 --- a/indra/llcharacter/llkeyframemotion.cpp +++ b/indra/llcharacter/llkeyframemotion.cpp @@ -534,6 +534,11 @@ LLMotion::LLMotionInitStatus LLKeyframeMotion::onInitialize(LLCharacter *charact joint_state->setUsage(joint_motion->mUsage); joint_state->setPriority(joint_motion->mPriority); } + else + { + // add dummy joint state with no associated joint + mJointStates.push_back(new LLJointState); + } } mAssetStatus = ASSET_LOADED; setupPose(); |