diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-11-14 16:20:05 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-11-14 16:20:05 +0200 |
| commit | 39652180aea043b4e8d0cb1f9a2a484e5ce2a471 (patch) | |
| tree | 9a2c286caf4e05eb30870e462e04cdf0c4b46f9b /indra/llcharacter/lljoint.cpp | |
| parent | ccd20624e37d74217b5d633fb74ebc81672c53f5 (diff) | |
| parent | 34770cbf2ef34b7901552057a0823e502d42be1d (diff) | |
Merged in lindenlab/axon
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(); } //-------------------------------------------------------------------- |