aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerjointmesh.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:56 -0500
committerJacek Antonelli2008-08-15 23:44:56 -0500
commitc07901e29ed545bbb02e3bddf148fe1104b94e9f (patch)
treef1ada64ce834acd7d92a425efb96c4b86bcf16b1 /linden/indra/newview/llviewerjointmesh.cpp
parentSecond Life viewer sources 1.15.0.2 (diff)
downloadmeta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.zip
meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.gz
meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.bz2
meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.xz
Second Life viewer sources 1.15.1.3
Diffstat (limited to 'linden/indra/newview/llviewerjointmesh.cpp')
-rw-r--r--linden/indra/newview/llviewerjointmesh.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llviewerjointmesh.cpp b/linden/indra/newview/llviewerjointmesh.cpp
index 216e29f..c76990c 100644
--- a/linden/indra/newview/llviewerjointmesh.cpp
+++ b/linden/indra/newview/llviewerjointmesh.cpp
@@ -216,11 +216,11 @@ S32 LLViewerJointMesh::getBoundJointsByIndex(S32 index, S32 &joint_a, S32& joint
216 if (render_datap->mSkinJoint) 216 if (render_datap->mSkinJoint)
217 { 217 {
218 joint_b = render_datap->mSkinJoint->mJoint->mJointNum; 218 joint_b = render_datap->mSkinJoint->mJoint->mJointNum;
219 }
220 219
221 if (joint_a == -1) 220 if (joint_a == -1)
222 { 221 {
223 joint_a = render_datap->mSkinJoint->mJoint->getParent()->mJointNum; 222 joint_a = render_datap->mSkinJoint->mJoint->getParent()->mJointNum;
223 }
224 } 224 }
225 num_joints++; 225 num_joints++;
226 } 226 }