diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-20 18:46:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-20 18:46:54 -0500 |
| commit | ad3dd05f4aea5db735b1c21bfccb34625a03f11d (patch) | |
| tree | 8058c31f361df612c588aaf8b92b0f55a5aa3f21 /indra/newview/lldrawable.cpp | |
| parent | a6592b783628eb1c5ab2d51b66cd98399c0e88cc (diff) | |
| parent | c42ed54b0a532cb4e0ad30a1b0b5038cef9938f2 (diff) | |
merge
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 68f52e04bc..efbb62011c 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -189,6 +189,11 @@ LLVOVolume* LLDrawable::getVOVolume() const } } +const LLMatrix4& LLDrawable::getRenderMatrix() const +{ + return isRoot() ? getWorldMatrix() : getParent()->getWorldMatrix(); +} + BOOL LLDrawable::isLight() const { LLViewerObject* objectp = mVObjp; @@ -713,8 +718,7 @@ void LLDrawable::updateDistance(LLCamera& camera, bool force_update) LLVOVolume* volume = getVOVolume(); if (volume) { - volume->updateRelativeXform(); - pos = volume->getRelativeXform().getTranslation(); + pos.set(getPositionGroup().getF32ptr()); if (isStatic()) { pos += volume->getRegion()->getOriginAgent(); |