diff --git a/indra/llappearance/llavatarjoint.h b/indra/llappearance/llavatarjoint.h
index d7e1df9cdf0c857060b3ef5f599f8e95745258d9..73e1e91b7f8e571695bdde2a3a7160d1ebc62b7a 100644
--- a/indra/llappearance/llavatarjoint.h
+++ b/indra/llappearance/llavatarjoint.h
@@ -52,7 +52,7 @@ class LLAvatarJoint :
 	virtual ~LLAvatarJoint() = default;
 
 	// Gets the validity of this joint
-	BOOL getValid() { return mValid; }
+	BOOL getValid() const { return mValid; }
 
 	// Sets the validity of this joint
 	virtual void setValid( BOOL valid, BOOL recursive=FALSE );
diff --git a/indra/llfilesystem/lldiskcache.h b/indra/llfilesystem/lldiskcache.h
index 2e244bf5b1ed1d690bbd86140e83647a9c8103ba..68f04ec3008473ecf2db95cbbb5f1d7ef807ad8d 100644
--- a/indra/llfilesystem/lldiskcache.h
+++ b/indra/llfilesystem/lldiskcache.h
@@ -64,7 +64,7 @@
 
 #include "llsingleton.h"
 
-class LLDiskCache :
+class LLDiskCache final :
     public LLParamSingleton<LLDiskCache>
 {
     public: