diff options
author | Dave Parks <davep@lindenlab.com> | 2010-05-01 00:46:50 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-05-01 00:46:50 -0500 |
commit | ad8fb0e1bb6c242cc84aa3d2cfaabc9ee36e39b6 (patch) | |
tree | f9a4fe3e89595e9f078d4bcd5a4f37139cfee005 /indra/newview/llviewerobject.h | |
parent | b0fa1e011f14356b3634f39d32f43e244b6f1298 (diff) | |
parent | f324787a70b8fccc7a8ea202805bf726fba765a7 (diff) |
merge
Diffstat (limited to 'indra/newview/llviewerobject.h')
-rw-r--r-- | indra/newview/llviewerobject.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 594d7a0827..0fd0cbfa60 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -181,6 +181,7 @@ public: void setOnActiveList(BOOL on_active) { mOnActiveList = on_active; } virtual BOOL isAttachment() const { return FALSE; } + 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 void updateRadius() {}; virtual F32 getVObjRadius() const; // default implemenation is mDrawable->getRadius() |