From ed517c3b1440145aaf7226c1ac8270f20509f708 Mon Sep 17 00:00:00 2001
From: Jon Wolk <jwolk@lindenlab.com>
Date: Thu, 24 Jan 2008 21:11:28 +0000
Subject: svn merge -r 77416:78126
 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer_abandoned
 -> release

---
 indra/llcharacter/llkeyframemotion.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/llcharacter/llkeyframemotion.cpp')

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();
-- 
cgit v1.2.3