diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-11 16:40:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-11 16:40:22 -0500 |
| commit | d1b4c5bf734b6d30ba0bb5a3bda3a4494100cc6d (patch) | |
| tree | 54a650e8e26dad00b3eaa3340b8bbf3083fc04b6 /indra/newview/llviewerobject.cpp | |
| parent | 5ca4a4b8f34342ef510a4241bef4af7cd544d865 (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
merge changes for 3.6.10-release
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rwxr-xr-x | indra/newview/llviewerobject.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 7151a0d6ed..1544e66431 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -5879,6 +5879,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; |