diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2022-05-27 21:15:49 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2022-05-27 21:15:49 +0000 |
| commit | 3f98411c56f4daa06c9102346a8dd37af18d2cb6 (patch) | |
| tree | 4255c2827cc3e07921275bfd7937f4f43f29d5fa /indra/llcharacter/lljoint.cpp | |
| parent | 3f58ec2fdfb76ce2160884a3e97be49f60b6ac90 (diff) | |
| parent | 02c71b0ac2f99dd1c26a649ffce2182b2fc9a7d9 (diff) | |
Merged in DV528-merge-6.6.1 (pull request #1000)
DRTVWR-528 merge up to 6.6.1
Diffstat (limited to 'indra/llcharacter/lljoint.cpp')
| -rw-r--r-- | indra/llcharacter/lljoint.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp index dee642310e..d72282ab42 100644 --- a/indra/llcharacter/lljoint.cpp +++ b/indra/llcharacter/lljoint.cpp @@ -922,6 +922,13 @@ const LLMatrix4 &LLJoint::getWorldMatrix() return mXform.getWorldMatrix(); } +const LLMatrix4a& LLJoint::getWorldMatrix4a() +{ + updateWorldMatrixParent(); + + return mWorldMatrix; +} + //-------------------------------------------------------------------- // setWorldMatrix() @@ -1003,6 +1010,7 @@ void LLJoint::updateWorldMatrix() { sNumUpdates++; mXform.updateMatrix(FALSE); + mWorldMatrix.loadu(mXform.getWorldMatrix()); mDirtyFlags = 0x0; } } |