summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-09-19 23:07:15 -0500
committerDave Parks <davep@lindenlab.com>2010-09-19 23:07:15 -0500
commit90da6d6fdc33343be72252101aed1be641e822b5 (patch)
tree66f6045cdf869324d16a57af613ab8213fedab42 /indra/newview/lldrawable.cpp
parent3cda7606380109beb3f331b8b53d38914f8ba8f5 (diff)
Raycasting for rigged attachments now works for your own attachments while in edit mode.
Diffstat (limited to 'indra/newview/lldrawable.cpp')
-rw-r--r--indra/newview/lldrawable.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 68f52e04bc..5949a373ae 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -189,6 +189,20 @@ LLVOVolume* LLDrawable::getVOVolume() const
}
}
+const LLMatrix4& LLDrawable::getRenderMatrix() const
+{
+ if (LLDrawable::isState(LLDrawable::RIGGED))
+ {
+ LLVOAvatar* avatar = mVObjp->getAvatar();
+ if (avatar)
+ {
+ return avatar->mDrawable->getWorldMatrix();
+ }
+ }
+
+ return isRoot() ? getWorldMatrix() : getParent()->getWorldMatrix();
+}
+
BOOL LLDrawable::isLight() const
{
LLViewerObject* objectp = mVObjp;