summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-12-05 10:39:35 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-12-05 10:39:35 -0500
commit744cf6be8d5a808020a4d6cc98ff4c6b208239c0 (patch)
treefab4ec7a30752ef1087d15540899830bf766cb89 /indra/newview/llviewerobject.cpp
parent1320e5ddcd9fc3be526dcacbf4710f8bcf878665 (diff)
parent787ccaf297e81291469aaf269f563d862fb150a3 (diff)
merge
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rwxr-xr-xindra/newview/llviewerobject.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 10b05c9af4..ca245217ed 100755
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -5903,6 +5903,13 @@ void LLViewerObject::resetChildrenPosition(const LLVector3& offset, BOOL simplif
return ;
}
+// virtual
+BOOL LLViewerObject::isTempAttachment() const
+{
+ return (mID.notNull() && (mID == mAttachmentItemID));
+}
+
+
const LLUUID &LLViewerObject::getAttachmentItemID() const
{
return mAttachmentItemID;