diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-05-23 04:56:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-05-23 04:56:13 -0400 |
| commit | 069dd355f90116b500065b40bfb36622be1faee5 (patch) | |
| tree | fe6cf12e89a715f46cf4e95ad91a5cf7f0e0c8a9 /indra/newview/llviewerobject.h | |
| parent | f9e049c9e5cc01b464e66cab3e34e33864946c0c (diff) | |
| parent | 48af8529a80052e9bc42f81f36896739f8aff861 (diff) | |
merge changes for 5.0.5-release
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 1e8f3f4ec2..24fcf0517e 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -178,6 +178,8 @@ public: virtual BOOL isHUDAttachment() const { return FALSE; } virtual BOOL isTempAttachment() const; + virtual BOOL isHiglightedOrBeacon() const; + virtual void updateRadius() {}; virtual F32 getVObjRadius() const; // default implemenation is mDrawable->getRadius() @@ -388,7 +390,7 @@ public: // Create if necessary LLAudioSource *getAudioSource(const LLUUID& owner_id); - bool isAudioSource() {return mAudioSourcep != NULL;} + BOOL isAudioSource() const {return mAudioSourcep != NULL;} U8 getMediaType() const; void setMediaType(U8 media_type); |