From 8d1e9b3c81ad9f38ae69a6a2ea9e9b7d7837824d Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 6 Apr 2022 06:54:04 -0400
Subject: [PATCH] And yet more warnings..
---
indra/newview/llvoavatar.h | 2 +-
indra/newview/llvoavatarself.h | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index c97501f58c4..4d36fa8fbf8 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -139,7 +139,7 @@ class LLVOAvatar :
void **user_data,
U32 block_num,
const EObjectUpdateType update_type,
- LLDataPacker *dp);
+ LLDataPacker *dp) override;
virtual void idleUpdate(LLAgent &agent, const F64 &time) override;
/*virtual*/ BOOL updateLOD() override;
BOOL updateJointLODs();
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index 4886259d10b..784ccc76f95 100644
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -109,22 +109,22 @@ class LLVOAvatarSelf final :
**/
public:
- /*virtual*/ bool isSelf() const { return true; }
- /*virtual*/ BOOL isValid() const;
+ /*virtual*/ bool isSelf() const override { return true; }
+ /*virtual*/ BOOL isValid() const override;
//--------------------------------------------------------------------
// Updates
//--------------------------------------------------------------------
public:
- /*virtual*/ bool updateCharacter(LLAgent &agent);
- /*virtual*/ void idleUpdateTractorBeam();
+ /*virtual*/ bool updateCharacter(LLAgent &agent) override;
+ void idleUpdateTractorBeam();
bool checkStuckAppearance();
//--------------------------------------------------------------------
// Loading state
//--------------------------------------------------------------------
public:
- /*virtual*/ bool getIsCloud() const;
+ /*virtual*/ bool getIsCloud() const override;
//--------------------------------------------------------------------
// Region state
@@ -175,7 +175,7 @@ class LLVOAvatarSelf final :
// Loading status
//--------------------------------------------------------------------
public:
- /*virtual*/ bool hasPendingBakedUploads() const;
+ bool hasPendingBakedUploads() const;
S32 getLocalDiscardLevel(LLAvatarAppearanceDefines::ETextureIndex type, U32 index) const;
bool areTexturesCurrent() const;
BOOL isLocalTextureDataAvailable(const LLViewerTexLayerSet* layerset) const;
@@ -271,7 +271,7 @@ class LLVOAvatarSelf final :
** MESHES
**/
protected:
- /*virtual*/ void restoreMeshData();
+ /*virtual*/ void restoreMeshData() override;
/** Meshes
** **
@@ -298,8 +298,8 @@ class LLVOAvatarSelf final :
// [RLVa:KB] - Checked: 2009-12-18 (RLVa-1.1.0i) | Added: RLVa-1.1.0i
LLViewerJointAttachment* getWornAttachmentPoint(const LLUUID& inv_item_id) const;
// [/RLVa:KB]
- /*virtual*/ const LLViewerJointAttachment *attachObject(LLViewerObject *viewer_object);
- /*virtual*/ BOOL detachObject(LLViewerObject *viewer_object);
+ /*virtual*/ const LLViewerJointAttachment *attachObject(LLViewerObject *viewer_object) override;
+ /*virtual*/ BOOL detachObject(LLViewerObject *viewer_object) override;
static BOOL detachAttachmentIntoInventory(const LLUUID& item_id);
// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
@@ -334,7 +334,7 @@ class LLVOAvatarSelf final :
// Visibility
//--------------------------------------------------------------------
- /* virtual */ bool shouldRenderRigged() const;
+ /* virtual */ bool shouldRenderRigged() const override;
public:
bool sendAppearanceMessage(LLMessageSystem *mesgsys) const;
@@ -342,7 +342,7 @@ class LLVOAvatarSelf final :
// -- care and feeding of hover height.
void setHoverIfRegionEnabled();
void sendHoverHeight() const;
- /*virtual*/ void setHoverOffset(const LLVector3& hover_offset, bool send_update=true);
+ /*virtual*/ void setHoverOffset(const LLVector3& hover_offset, bool send_update=true) override;
private:
mutable LLVector3 mLastHoverOffsetSent;
--
GitLab