diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-11-14 15:22:47 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-11-14 15:22:47 -0800 |
| commit | aa0115053aaa28de1c472410931c57b3e43b72a7 (patch) | |
| tree | 9a8ba45529cb125a2ae5cd4672b3fd093af9b45c /indra/llcharacter/lljoint.cpp | |
| parent | 4662ba8a2693780198d555a49a00cfafba838d41 (diff) | |
| parent | 1d022e86c84039f88c531e91ce857666acd224a1 (diff) | |
Merge
Diffstat (limited to 'indra/llcharacter/lljoint.cpp')
| -rw-r--r-- | indra/llcharacter/lljoint.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp index a3d5679f65..e2f512f86e 100644 --- a/indra/llcharacter/lljoint.cpp +++ b/indra/llcharacter/lljoint.cpp @@ -428,13 +428,6 @@ void LLJoint::addAttachmentPosOverride( const LLVector3& pos, const LLUUID& mesh { return; } - // BENTO - // Not clear pelvis overrides are meaningful/useful. - //if (mName == "mPelvis") - //{ - // return; - //} - LLVector3 before_pos; LLUUID before_mesh_id; bool has_active_override_before = hasAttachmentPosOverride( before_pos, before_mesh_id ); @@ -881,7 +874,7 @@ void LLJoint::setWorldRotation( const LLQuaternion& rot ) //-------------------------------------------------------------------- const LLVector3& LLJoint::getScale() { - return mXform.getScale(); + return mXform.getScale(); } //-------------------------------------------------------------------- |