diff options
| -rw-r--r-- | indra/llappearance/llpolyskeletaldistortion.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 10 |
2 files changed, 6 insertions, 15 deletions
diff --git a/indra/llappearance/llpolyskeletaldistortion.cpp b/indra/llappearance/llpolyskeletaldistortion.cpp index 8e9b52e974..a427f7c754 100644 --- a/indra/llappearance/llpolyskeletaldistortion.cpp +++ b/indra/llappearance/llpolyskeletaldistortion.cpp @@ -207,12 +207,13 @@ void LLPolySkeletalDistortion::apply( ESex avatar_sex ) LLVector3 offset = (effective_weight - mLastWeight) * scaleDelta; newScale = newScale + offset; //An aspect of attached mesh objects (which contain joint offsets) that need to be cleaned up when detached - // needed? // joint->storeScaleForReset( newScale ); + // needed? + // joint->storeScaleForReset( newScale ); - // BENTO debugging stuff can be pulled. - std::stringstream ostr; - ostr << "LLPolySkeletalDistortion::apply, id " << getID() << " " << getName() << " effective wt " << effective_weight << " last wt " << mLastWeight << " scaleDelta " << scaleDelta << " offset " << offset; - LLScopedContextString str(ostr.str()); + // BENTO for detailed stack tracing of params. + //std::stringstream ostr; + //ostr << "LLPolySkeletalDistortion::apply, id " << getID() << " " << getName() << " effective wt " << effective_weight << " last wt " << mLastWeight << " scaleDelta " << scaleDelta << " offset " << offset; + //LLScopedContextString str(ostr.str()); joint->setScale(newScale); } diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 0448fc6138..340f19c39e 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -1907,16 +1907,6 @@ void LLVOAvatar::resetSkeleton() // Restore attachment pos overrides rebuildAttachmentPosOverrides(); - // Restore mPelvis state - //getJoint("mPelvis")->setRotation(pelvis_rot); - //getJoint("mPelvis")->setPosition(pelvis_pos); - - // Restart animations BENTO - not needed? Removing this fixes a - // problem seen if avatar is sitting and animated relative to sit - // point. - - //resetAnimations(); - LL_DEBUGS("Avatar") << avString() << " reset ends" << LL_ENDL; } |