From b839597df25d3cffa22b66a8c5875689457f683c Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 6 Nov 2021 17:23:16 -0400
Subject: [PATCH] Fix warning
---
indra/newview/llviewerjoint.h | 2 +-
indra/newview/llviewerjointmesh.h | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewerjoint.h b/indra/newview/llviewerjoint.h
index 7fa1ff45780..270a9ccbfdd 100644
--- a/indra/newview/llviewerjoint.h
+++ b/indra/newview/llviewerjoint.h
@@ -51,7 +51,7 @@ class LLViewerJoint :
LLViewerJoint(const std::string &name, LLJoint *parent = NULL);
virtual ~LLViewerJoint();
- LLViewerJoint* asViewerJoint() final { return static_cast<LLViewerJoint*>(this); }
+ LLViewerJoint* asViewerJoint() override { return static_cast<LLViewerJoint*>(this); }
// Render character hierarchy.
// Traverses the entire joint hierarchy, setting up
diff --git a/indra/newview/llviewerjointmesh.h b/indra/newview/llviewerjointmesh.h
index 0db2836e150..4a9329b05d2 100644
--- a/indra/newview/llviewerjointmesh.h
+++ b/indra/newview/llviewerjointmesh.h
@@ -41,7 +41,7 @@ class LLViewerTexLayerSet;
//-----------------------------------------------------------------------------
// class LLViewerJointMesh
//-----------------------------------------------------------------------------
-class LLViewerJointMesh : public LLAvatarJointMesh, public LLViewerJoint
+class LLViewerJointMesh final : public LLAvatarJointMesh, public LLViewerJoint
{
public:
// Constructor
@@ -50,6 +50,8 @@ class LLViewerJointMesh : public LLAvatarJointMesh, public LLViewerJoint
// Destructor
virtual ~LLViewerJointMesh();
+ LLViewerJoint* asViewerJoint() override { return static_cast<LLViewerJoint*>(this); }
+
// Render time method to upload batches of joint matrices
void uploadJointMatrices();
--
GitLab