2 files changed, 14 insertions, 3 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index d89feec..36c8f2d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,11 @@
+2010-03-01 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Applied slviewer-0-v11905-UnknownJointsCrashFix_v2.patch from CV to fix crash when encountering
+          avatars using multiple attachment points.
+          
+          modified:   linden/indra/llcharacter/llkeyframemotion.cpp
+
+
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 =-                      1.3.0 BETA 1                      -=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
diff --git a/linden/indra/llcharacter/llkeyframemotion.cpp b/linden/indra/llcharacter/llkeyframemotion.cpp
index e6ef767..4cb2227 100644
--- a/linden/indra/llcharacter/llkeyframemotion.cpp
+++ b/linden/indra/llcharacter/llkeyframemotion.cpp
@@ -1159,9 +1159,12 @@ void LLKeyframeMotion::applyConstraint(JointConstraint* constraint, F32 time, U8
         {
                 LLVector3 delta = source_to_target * weight;
                 LLPointer<LLJointState> current_joint_state = getJointState(shared_data->mJointStateIndices[0]);
-                LLQuaternion parent_rot = current_joint_state->getJoint()->getParent()->getWorldRotation();
-                delta = delta * ~parent_rot;
-                current_joint_state->setPosition(current_joint_state->getJoint()->getPosition() + delta);
+                if (current_joint_state->getJoint())
+                {
+                        LLQuaternion parent_rot = current_joint_state->getJoint()->getParent()->getWorldRotation();
+                        delta = delta * ~parent_rot;
+                        current_joint_state->setPosition(current_joint_state->getJoint()->getPosition() + delta);
+                }
         }
 }