summaryrefslogtreecommitdiff
path: root/indra/llcharacter
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-08-15 10:38:46 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-08-15 10:38:46 -0400
commit0fdfd3ceec14d3ffd6aa6268964ec91df44002a3 (patch)
tree0f0c20f85770ec5e8af85c0f05c3d73782ca7e7d /indra/llcharacter
parent1346949e4d601e8c945fa30593ba1d405e9ed80d (diff)
MAINT-4158 WIP - fix for at least some forms of distortion. I can't repro the drastic height changes, so not positive it addresses that.
Diffstat (limited to 'indra/llcharacter')
-rwxr-xr-xindra/llcharacter/lljoint.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp
index dbd6d48a95..c78c38c3a7 100755
--- a/indra/llcharacter/lljoint.cpp
+++ b/indra/llcharacter/lljoint.cpp
@@ -275,7 +275,7 @@ void LLJoint::storeScaleForReset( const LLVector3& scale )
//--------------------------------------------------------------------
void LLJoint::restoreOldXform( void )
{
- mXform = mDefaultXform;
+ mXform = mOldXform;
mResetAfterRestoreOldXform = false;
mDirtyFlags = ALL_DIRTY;
}
@@ -432,7 +432,7 @@ const LLMatrix4 &LLJoint::getWorldMatrix()
//--------------------------------------------------------------------
void LLJoint::setWorldMatrix( const LLMatrix4& mat )
{
-LL_INFOS() << "WARNING: LLJoint::setWorldMatrix() not correctly implemented yet" << LL_ENDL;
+ LL_INFOS() << "WARNING: LLJoint::setWorldMatrix() not correctly implemented yet" << LL_ENDL;
// extract global translation
LLVector3 trans( mat.mMatrix[VW][VX],
mat.mMatrix[VW][VY],