From f55f974b1bd48d124cfe782c197b19fb85c4f6f5 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 24 Apr 2022 17:27:31 -0400
Subject: [PATCH] Warning fixes
---
indra/newview/llvograss.h | 4 ++--
indra/newview/llvosurfacepatch.h | 4 ++--
indra/newview/llvowater.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llvograss.h b/indra/newview/llvograss.h
index 86f4ef6ab7d..6e5305e0eda 100644
--- a/indra/newview/llvograss.h
+++ b/indra/newview/llvograss.h
@@ -43,7 +43,7 @@ class LLVOGrass final : public LLAlphaObject
static void initClass();
static void cleanupClass();
- virtual U32 getPartitionType() const;
+ U32 getPartitionType() const override;
/*virtual*/ U32 processUpdateMessage(LLMessageSystem *mesgsys,
void **user_data,
@@ -65,7 +65,7 @@ class LLVOGrass final : public LLAlphaObject
LLStrider<LLColor4U>& emissivep,
LLStrider<U16>& indicesp);
- void updateFaceSize(S32 idx) { }
+ void updateFaceSize(S32 idx) override { }
/*virtual*/ void updateTextures();
/*virtual*/ BOOL updateLOD();
/*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area
diff --git a/indra/newview/llvosurfacepatch.h b/indra/newview/llvosurfacepatch.h
index 3b68911af57..fc54aded6a3 100644
--- a/indra/newview/llvosurfacepatch.h
+++ b/indra/newview/llvosurfacepatch.h
@@ -53,13 +53,13 @@ class LLVOSurfacePatch final : public LLStaticViewerObject
/*virtual*/ void markDead() override;
- virtual U32 getPartitionType() const;
+ virtual U32 getPartitionType() const override;
/*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline) override;
/*virtual*/ void updateGL() override;
/*virtual*/ BOOL updateGeometry(LLDrawable *drawable) override;
/*virtual*/ BOOL updateLOD() override;
- /*virtual*/ void updateFaceSize(S32 idx);
+ /*virtual*/ void updateFaceSize(S32 idx) override;
void getGeometry(LLStrider<LLVector3> &verticesp,
LLStrider<LLVector3> &normalsp,
LLStrider<LLVector2> &texCoords0p,
diff --git a/indra/newview/llvowater.h b/indra/newview/llvowater.h
index 3a6550e5d71..88f246808e4 100644
--- a/indra/newview/llvowater.h
+++ b/indra/newview/llvowater.h
@@ -89,7 +89,7 @@ class LLVOVoidWater final : public LLVOWater
mRenderType = LLPipeline::RENDER_TYPE_VOIDWATER;
}
- /*virtual*/ U32 getPartitionType() const;
+ /*virtual*/ U32 getPartitionType() const override;
};
--
GitLab