diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-04-22 14:51:57 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-04-22 14:51:57 -0400 |
| commit | 70156605e283326e9476908141c44c197f9c6d18 (patch) | |
| tree | 3755acf0b62e6bbaa5189d3765fa7cc233d3a001 /indra/llappearance | |
| parent | cad96c6d86445f8a0996bc786db6fe225bf3a175 (diff) | |
SL-374 - don't allow sliders to modify joint positions if there's already a mesh-imposed override in place.
Diffstat (limited to 'indra/llappearance')
| -rw-r--r-- | indra/llappearance/llpolyskeletaldistortion.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llappearance/llpolyskeletaldistortion.cpp b/indra/llappearance/llpolyskeletaldistortion.cpp index 722965af28..484969a9d9 100644 --- a/indra/llappearance/llpolyskeletaldistortion.cpp +++ b/indra/llappearance/llpolyskeletaldistortion.cpp @@ -226,7 +226,8 @@ void LLPolySkeletalDistortion::apply( ESex avatar_sex ) LLVector3 positionDelta = iter->second; newPosition = newPosition + (effective_weight * positionDelta) - (mLastWeight * positionDelta); // SL-315 - joint->setPosition(newPosition); + // BENTO - allow attachment positions to override requests from the params. + joint->setPosition(newPosition, true); } if (mLastWeight != mCurWeight && !mIsAnimating) |