diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-08-15 10:38:46 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-08-15 10:38:46 -0400 |
| commit | aa96b808981d9453c49d749308a98173ce1864bb (patch) | |
| tree | 9f7aa16a01c587dc2b2b7aeadbe1b75dcf7cfe77 /indra/llcharacter/lljoint.cpp | |
| parent | b99d57fbdeda3f012e090bb610f9d3fb44f4248f (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/lljoint.cpp')
| -rwxr-xr-x | indra/llcharacter/lljoint.cpp | 4 |
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], |