From b01d567a5d9e2b5dd28bcc7b3f474fabd93e7a2f Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 7 Dec 2007 20:27:13 +0000 Subject: EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge EFFECTIVE MERGE: merge -r 74370 library-update -> maint-viewer-2-merge ACTUAL MERGE: release@75267 maint-viewer-2-merge@75293 -> release --- indra/llcharacter/lljoint.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llcharacter/lljoint.h') diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h index 167598fc70..8ca8118e4c 100644 --- a/indra/llcharacter/lljoint.h +++ b/indra/llcharacter/lljoint.h @@ -115,7 +115,7 @@ public: void touch(U32 flags = ALL_DIRTY); // get/set name - const std::string &getName() { return mName; } + const std::string& getName() const { return mName; } void setName( const std::string &name ) { mName = name; } // getParent @@ -175,7 +175,7 @@ public: virtual BOOL isAnimatable() { return TRUE; } - S32 getJointNum() { return mJointNum; } + S32 getJointNum() const { return mJointNum; } void setJointNum(S32 joint_num) { mJointNum = joint_num; } }; #endif // LL_LLJOINT_H -- cgit v1.3