diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-02-27 17:15:35 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-02-27 17:15:35 -0600 |
| commit | 523f94cca97c9345277c33b030160adc19539ba3 (patch) | |
| tree | 5c04f99978572c98c7e0450f6c0e1a8f06ec7454 /indra/newview/llvoavatar.h | |
| parent | a128836dedf25dc56807cced9316fbaa09a7f019 (diff) | |
SH-2889 Fix for crash when encountering certain attachments.
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index dd0317f555..6a4e09593c 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -185,7 +185,7 @@ public: void resetSpecificJointPosition( const std::string& name ); virtual const char* getAnimationPrefix() { return "avatar"; } - virtual const LLUUID& getID(); + virtual const LLUUID& getID() const; virtual LLVector3 getVolumePos(S32 joint_index, LLVector3& volume_offset); virtual LLJoint* findCollisionVolume(U32 volume_id); virtual S32 getCollisionVolumeID(std::string &name); @@ -382,7 +382,7 @@ private: public: U32 renderImpostor(LLColor4U color = LLColor4U(255,255,255,255), S32 diffuse_channel = 0); - bool isVisuallyMuted(); + bool isVisuallyMuted() const; U32 renderRigid(); U32 renderSkinned(EAvatarRenderPass pass); |