From 6afda538b3ca0ba59c3eca2da3bcc9a82c6d61bd Mon Sep 17 00:00:00 2001
From: XenHat <me@xenh.at>
Date: Sun, 21 Jan 2024 13:20:21 -0500
Subject: [PATCH] Fix missing override keyword in a few virtual functions
---
indra/newview/llfloaterimnearbychat.h | 20 ++++++++++----------
indra/newview/llfloaterworldmap.h | 16 ++++++++--------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/indra/newview/llfloaterimnearbychat.h b/indra/newview/llfloaterimnearbychat.h
index 1efaf6fafa1..018124977d6 100644
--- a/indra/newview/llfloaterimnearbychat.h
+++ b/indra/newview/llfloaterimnearbychat.h
@@ -56,12 +56,12 @@ class LLFloaterIMNearbyChat final
static LLFloaterIMNearbyChat* buildFloater(const LLSD& key);
- /*virtual*/ BOOL postBuild();
- /*virtual*/ void onOpen(const LLSD& key);
- /*virtual*/ void onClose(bool app_quitting);
- /*virtual*/ void setVisible(BOOL visible);
- /*virtual*/ void setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD());
- /*virtual*/ void closeHostedFloater();
+ /*virtual*/ BOOL postBuild() override;
+ /*virtual*/ void onOpen(const LLSD& key) override;
+ /*virtual*/ void onClose(bool app_quitting) override;
+ /*virtual*/ void setVisible(BOOL visible) override;
+ /*virtual*/ void setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD()) override;
+ /*virtual*/ void closeHostedFloater() override;
void loadHistory();
void reloadMessages(bool clean_messages = false);
@@ -79,7 +79,7 @@ class LLFloaterIMNearbyChat final
std::string getCurrentChat();
S32 getMessageArchiveLength() {return mMessageArchive.size();}
- virtual BOOL handleKeyHere( KEY key, MASK mask );
+ BOOL handleKeyHere( KEY key, MASK mask ) override;
static void startChat(const char* line);
static void stopChat();
@@ -112,8 +112,8 @@ class LLFloaterIMNearbyChat final
void onChatBoxCommit();
void onChatFontChange(LLFontGL* fontp);
- /*virtual*/ void onTearOffClicked();
- /*virtual*/ void onClickCloseBtn(bool app_qutting = false);
+ /*virtual*/ void onTearOffClicked() override;
+ /*virtual*/ void onClickCloseBtn(bool app_qutting = false) override;
public:
static LLWString stripChannelNumber(const LLWString &mesg, S32* channel);
@@ -134,7 +134,7 @@ class LLFloaterIMNearbyChat final
S32 mExpandedHeight;
private:
- /*virtual*/ void refresh();
+ /*virtual*/ void refresh() override;
std::vector<LLChat> mMessageArchive;
diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h
index 0e0f9374f4b..bdc22895ab2 100644
--- a/indra/newview/llfloaterworldmap.h
+++ b/indra/newview/llfloaterworldmap.h
@@ -61,19 +61,19 @@ class LLFloaterWorldMap final : public LLRemoteParcelInfoObserver, public LLFloa
static LLFloaterWorldMap* getInstance();
static void *createWorldMapView(void* data);
- BOOL postBuild();
+ BOOL postBuild() override;
- /*virtual*/ void onOpen(const LLSD& key);
- /*virtual*/ void onClose(bool app_quitting);
+ /*virtual*/ void onOpen(const LLSD& key) override;
+ /*virtual*/ void onClose(bool app_quitting) override;
static void reloadIcons(void*);
- /*virtual*/ void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE );
- /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
- /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
- /*virtual*/ void draw();
+ /*virtual*/ void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE ) override;
+ /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask) override;
+ /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks) override;
+ /*virtual*/ void draw() override;
- /*virtual*/ void onFocusLost();
+ /*virtual*/ void onFocusLost() override;
// methods for dealing with inventory. The observe() method is
// called during program startup. inventoryUpdated() will be
--
GitLab