SL-124 - comment cleanup, fixed a crash if skinned mesh has no valid joint names defined

1 files changed, 2 insertions, 13 deletions

diff --git a/indra/llappearance/llpolyskeletaldistortion.cpp b/indra/llappearance/llpolyskeletaldistortion.cpp
index fdce8d97ce..8e9b52e974 100644
--- a/indra/llappearance/llpolyskeletaldistortion.cpp
+++ b/indra/llappearance/llpolyskeletaldistortion.cpp
@@ -154,12 +154,6 @@ BOOL LLPolySkeletalDistortion::setInfo(LLPolySkeletalDistortionInfo *info)
             continue;
         }
 
-        // BENTO remove?
-        //if (mJointScales.find(joint) != mJointScales.end())
-        //{
-        //    LL_WARNS() << "Scale deformation already supplied for joint " << joint->getName() << "." << LL_ENDL;
-        //}
-
         // store it
         mJointScales[joint] = bone_info->mScaleDeformation;
 
@@ -178,11 +172,6 @@ BOOL LLPolySkeletalDistortion::setInfo(LLPolySkeletalDistortionInfo *info)
 
         if (bone_info->mHasPositionDeformation)
         {
-            // BENTO remove?
-            //if (mJointOffsets.find(joint) != mJointOffsets.end())
-            //{
-            //    LL_WARNS() << "Offset deformation already supplied for joint " << joint->getName() << "." << LL_ENDL;
-            //}
             mJointOffsets[joint] = bone_info->mPositionDeformation;
         }
     }
@@ -237,8 +226,8 @@ void LLPolySkeletalDistortion::apply( ESex avatar_sex )
                 LLVector3 positionDelta = iter->second;				
                 newPosition = newPosition + (effective_weight * positionDelta) - (mLastWeight * positionDelta);		
                 // SL-315
-                // BENTO - allow attachment positions to override requests from the params.
-                joint->setPosition(newPosition, true);
+                bool allow_attachment_pos_overrides = true;
+                joint->setPosition(newPosition, allow_attachment_pos_overrides);
         }
 
         if (mLastWeight != mCurWeight && !mIsAnimating)