diff options
| author | Rye <rye@alchemyviewer.org> | 2026-01-07 09:21:13 -0500 |
|---|---|---|
| committer | Rye <rye@alchemyviewer.org> | 2026-01-07 09:21:13 -0500 |
| commit | cab31f8bfed507425a09b266d47823f6acddfa94 (patch) | |
| tree | 77c9f59277aad29cf00dd2de00d97c1909f9f59e /indra/newview/lldrawable.cpp | |
| parent | 516bd5e832a91e1f837b5b1b621cfac5fe71c08f (diff) | |
| parent | 0c9dfeb2c709ced86ca9967a82b9816eb192c54c (diff) | |
Merge remote-tracking branch 'origin/develop' into develop-linux
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 322ee90541..da9378ad12 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -723,9 +723,13 @@ F32 LLDrawable::updateXform(bool undamped) mXform.setRotation(target_rot); mXform.setScale(LLVector3(1,1,1)); //no scale in drawable transforms (IT'S A RULE!) mXform.updateMatrix(); - if (isRoot() && mVObjp->isAnimatedObject() && mVObjp->getControlAvatar()) + if (isRoot() && mVObjp->isAnimatedObject()) { - mVObjp->getControlAvatar()->matchVolumeTransform(); + LLControlAvatar* cav = mVObjp->getControlAvatar(); + if (cav) + { + cav->matchVolumeTransform(); + } } if (mSpatialBridge) |