diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-22 10:06:45 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-22 10:06:45 -0500 |
| commit | d33bb1fe675a926a434539c3e59c13c35d425fe3 (patch) | |
| tree | 64c2fe2e02d2dfd008bf2040616a614fc09f4835 /indra/newview/llviewerobject.h | |
| parent | f179fcd0006bdfd0ea99041d0d663049466ffd2a (diff) | |
| parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rwxr-xr-x | indra/newview/llviewerobject.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index bab107cc57..05c87c153b 100755 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -135,6 +135,8 @@ public: virtual LLVOAvatar* asAvatar(); + LLVOAvatar* getAvatarAncestor(); + static void initVOClasses(); static void cleanupVOClasses(); @@ -170,6 +172,8 @@ public: void setOnActiveList(BOOL on_active) { mOnActiveList = on_active; } virtual BOOL isAttachment() const { return FALSE; } + const std::string& getAttachmentItemName(); + virtual LLVOAvatar* getAvatar() const; //get the avatar this object is attached to, or NULL if object is not an attachment virtual BOOL isHUDAttachment() const { return FALSE; } virtual BOOL isTempAttachment() const; |