From 70156605e283326e9476908141c44c197f9c6d18 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 22 Apr 2016 14:51:57 -0400
Subject: SL-374 - don't allow sliders to modify joint positions if there's
 already a mesh-imposed override in place.

---
 indra/llappearance/llpolyskeletaldistortion.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/llappearance')

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)
-- 
cgit v1.2.3