From 547c0665eaa19b6a2b5112faeae75e3a270b7a36 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 26 Jan 2023 14:45:45 -0800
Subject: DRTVWR-489-emoji: As part of the work to get macOS version of the
 Viewer working, the flag was introduced to warn (and therefore error out)
 when a virtual override was not marked with the 'override' keyword. Fixing
 this up involved a large number of changes and this commit represents just
 those changes - nothing specially from the DRTVWR-489 viewer

(Cherry pick of 3 commits from Callum to declutter the emoji PR: 3185bdea27b19e155c2ccc03c80624e113d312a6,
923733e591eb547ad5dfec395ce7d3e8f0468c16 and 6f31fabbc2d082b77c8f09bce30234ec9c506e33)
---
 indra/newview/llviewerparcelmedia.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llviewerparcelmedia.h')

diff --git a/indra/newview/llviewerparcelmedia.h b/indra/newview/llviewerparcelmedia.h
index 779a65bdf8..790b2b71fc 100644
--- a/indra/newview/llviewerparcelmedia.h
+++ b/indra/newview/llviewerparcelmedia.h
@@ -74,7 +74,7 @@ public:
 	void sendMediaNavigateMessage(const std::string& url);
 
 	// inherited from LLViewerMediaObserver
-	virtual void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+	virtual void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) override;
 
 private:
 	void processParcelMediaCommandMessage(LLMessageSystem *msg);
-- 
cgit v1.2.3