1 files changed, 13 insertions, 15 deletions

diff --git a/indra/newview/llviewerjointattachment.h b/indra/newview/llviewerjointattachment.h
index e5edf2c06b..980ac3a7ca 100644
--- a/indra/newview/llviewerjointattachment.h
+++ b/indra/newview/llviewerjointattachment.h
@@ -47,32 +47,30 @@ public:
 	LLViewerJointAttachment();
 	virtual ~LLViewerJointAttachment();
 
-	//virtual U32 render( F32 pixelArea );	// Returns triangle count
-
 	// Returns true if this object is transparent.
 	// This is used to determine in which order to draw objects.
-	/*virtual*/ BOOL isTransparent();
+	bool isTransparent() override;
 
 	// Draws the shape attached to a joint.
 	// Called by render().
-	/*virtual*/ U32 drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy );
+	U32 drawShape( F32 pixelArea, bool first_pass, bool is_dummy ) override;
 	
-	/*virtual*/ BOOL updateLOD(F32 pixel_area, BOOL activate);
+	bool updateLOD(F32 pixel_area, bool activate) override;
 
 	//
 	// accessors
 	//
 
 	void setPieSlice(S32 pie_slice) { mPieSlice = pie_slice; }	
-	void setVisibleInFirstPerson(BOOL visibility) { mVisibleInFirst = visibility; }
-	BOOL getVisibleInFirstPerson() const { return mVisibleInFirst; }
+	void setVisibleInFirstPerson(bool visibility) { mVisibleInFirst = visibility; }
+	bool getVisibleInFirstPerson() const { return mVisibleInFirst; }
 	void setGroup(S32 group) { mGroup = group; }
 	void setOriginalPosition(LLVector3 &position);
-	void setAttachmentVisibility(BOOL visible);
-	void setIsHUDAttachment(BOOL is_hud) { mIsHUDAttachment = is_hud; }
-	BOOL getIsHUDAttachment() const { return mIsHUDAttachment; }
+	void setAttachmentVisibility(bool visible);
+	void setIsHUDAttachment(bool is_hud) { mIsHUDAttachment = is_hud; }
+	bool getIsHUDAttachment() const { return mIsHUDAttachment; }
 
-	BOOL isAnimatable() const { return FALSE; }
+	bool isAnimatable() const override { return false; }
 
 	S32 getGroup() const { return mGroup; }
 	S32 getPieSlice() const { return mPieSlice; }
@@ -84,13 +82,13 @@ public:
 	//
 	// unique methods
 	//
-	BOOL addObject(LLViewerObject* object);
+	bool addObject(LLViewerObject* object);
 	void removeObject(LLViewerObject *object);
 
 	// 
 	// attachments operations
 	//
-	BOOL isObjectAttached(const LLViewerObject *viewer_object) const;
+	bool isObjectAttached(const LLViewerObject *viewer_object) const;
 	const LLViewerObject *getAttachedObject(const LLUUID &object_id) const;
 	LLViewerObject *getAttachedObject(const LLUUID &object_id);
 
@@ -103,10 +101,10 @@ protected:
 	void setupDrawable(LLViewerObject *object);
 
 private:
-	BOOL			mVisibleInFirst;
+	bool			mVisibleInFirst;
 	LLVector3		mOriginalPos;
 	S32				mGroup;
-	BOOL			mIsHUDAttachment;
+	bool			mIsHUDAttachment;
 	S32				mPieSlice;
 };