summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-12-12 09:59:50 -0800
committerMerov Linden <merov@lindenlab.com>2013-12-12 09:59:50 -0800
commit4745ab85dab9e418c49e5c4a722aa88548b8f39e (patch)
tree367001447fda9438c5beb03f2fb09bbe7e2b2abd /indra/newview/llviewerobject.h
parent6a89cb6f25adafdf07a4241e7bbe6fee758c1048 (diff)
parenta4f121f065c580ac34e8caa666855c95eb29138b (diff)
Pull merge from lindenlab/viewer-acme
Diffstat (limited to 'indra/newview/llviewerobject.h')
-rwxr-xr-xindra/newview/llviewerobject.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index b035473c74..80bdd628a1 100755
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -171,6 +171,8 @@ public:
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 BOOL isTempAttachment() const;
+
virtual void updateRadius() {};
virtual F32 getVObjRadius() const; // default implemenation is mDrawable->getRadius()