diff --git a/indra/newview/llviewerjoint.h b/indra/newview/llviewerjoint.h
index 7fa1ff45780a217e63748f611d628eab36cdb837..270a9ccbfddb4e614dcd129eb2fd71ebd3073698 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 0db2836e150b749e8e2c03e1a0fa34340deb1e48..4a9329b05d21bb1c83f050ca3e619dcb9f108dbf 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();