diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
| commit | 1c909afe3998778e4cc045c9ab733e8afbf7c25b (patch) | |
| tree | 75c00a32a8e305280cbec253195d1113d628fc3e /indra/newview/llviewerjointmesh.cpp | |
| parent | bc59c04653bf1404e8148a8169208b146a123b28 (diff) | |
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/newview/llviewerjointmesh.cpp')
| -rw-r--r-- | indra/newview/llviewerjointmesh.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp index 9bb4aa4cf9..150943465d 100644 --- a/indra/newview/llviewerjointmesh.cpp +++ b/indra/newview/llviewerjointmesh.cpp @@ -196,11 +196,11 @@ S32 LLViewerJointMesh::getBoundJointsByIndex(S32 index, S32 &joint_a, S32& joint if (render_datap->mSkinJoint) { joint_b = render_datap->mSkinJoint->mJoint->mJointNum; - } - if (joint_a == -1) - { - joint_a = render_datap->mSkinJoint->mJoint->getParent()->mJointNum; + if (joint_a == -1) + { + joint_a = render_datap->mSkinJoint->mJoint->getParent()->mJointNum; + } } num_joints++; } |