diff --git a/indra/newview/llnamebox.h b/indra/newview/llnamebox.h
index 52992d0eb..2d991ecec 100644
--- a/indra/newview/llnamebox.h
+++ b/indra/newview/llnamebox.h
@@ -36,7 +36,7 @@
 #include "llnameui.h"
 #include "lltextbox.h"
 
-class LLNameBox
+class LLNameBox final
 :	public LLTextBox
 ,	public LLNameUI
 {
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
index 4a2bf209a..ba0e6ebb4 100644
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -39,7 +39,7 @@ class LLAvatarName;
  * We don't use LLScrollListItem to be able to override getUUID(), which is needed
  * because the name list item value is not simply an UUID but a map (uuid, is_group).
  */
-class LLNameListItem : public LLScrollListItem, public LLHandleProvider<LLNameListItem>
+class LLNameListItem final : public LLScrollListItem, public LLHandleProvider<LLNameListItem>
 {
 public:
 	enum ENameType
@@ -86,7 +86,7 @@ private:
 };
 
 
-class LLNameListCtrl
+class LLNameListCtrl final
 :	public LLScrollListCtrl, public LLInstanceTracker<LLNameListCtrl>
 {
 public:
diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h
index b5e102889..47c32438b 100644
--- a/indra/newview/llnetmap.h
+++ b/indra/newview/llnetmap.h
@@ -46,7 +46,7 @@ class LLViewerRegion;
 class LLAvatarName;
 // [/SL:KB]
 
-class LLNetMap : public LLPanel, public LFIDBearer
+class LLNetMap final : public LLPanel, public LFIDBearer
 {
 public:
 	LLNetMap(const std::string& name);
@@ -68,9 +68,9 @@ public:
 	/*virtual*/ BOOL	handleRightMouseDown( S32 x, S32 y, MASK mask );
 	/*virtual*/ BOOL	handleDoubleClick( S32 x, S32 y, MASK mask );
 
-	LLUUID getStringUUIDSelectedItem() const override { return mClosestAgentAtLastRightClick; }
-	uuid_vec_t getSelectedIDs() const override { return mClosestAgentsAtLastClick; }
-	S32 getNumSelected() const override { return mClosestAgentsAtLastClick.size(); }
+	LLUUID getStringUUIDSelectedItem() const override final { return mClosestAgentAtLastRightClick; }
+	uuid_vec_t getSelectedIDs() const override final { return mClosestAgentsAtLastClick; }
+	S32 getNumSelected() const override final { return mClosestAgentsAtLastClick.size(); }
 
 	static void mm_setcolor(LLUUID key,LLColor4 col); //moymod
 
diff --git a/indra/newview/llviewertexteditor.h b/indra/newview/llviewertexteditor.h
index a7741502f..9b5edcc88 100644
--- a/indra/newview/llviewertexteditor.h
+++ b/indra/newview/llviewertexteditor.h
@@ -39,7 +39,7 @@
 //
 // Classes
 //
-class LLViewerTextEditor : public LLTextEditor
+class LLViewerTextEditor final : public LLTextEditor
 {
 	
 public: