From a3c5a72cfd40e6b099ed70dec0ade15b5fa577cc Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 2 Mar 2024 13:25:43 +0100 Subject: [PATCH] Add missing overrides --- indra/newview/fsgridhandler.h | 2 +- indra/newview/fslslbridge.h | 18 +++++++++--------- indra/newview/fsnearbychathub.h | 2 -- indra/newview/llavatarpropertiesprocessor.h | 4 ---- indra/newview/llchicletbar.h | 10 +++++----- indra/newview/lltoolcomp.h | 4 ++-- indra/newview/lltoolface.h | 4 ++-- indra/newview/qtoolalign.h | 12 ++++++------ indra/newview/rlvinventory.h | 2 +- indra/newview/utilitybar.h | 2 +- 10 files changed, 27 insertions(+), 33 deletions(-) diff --git a/indra/newview/fsgridhandler.h b/indra/newview/fsgridhandler.h index 1b1e8ad21f..8ac57866b2 100644 --- a/indra/newview/fsgridhandler.h +++ b/indra/newview/fsgridhandler.h @@ -128,7 +128,7 @@ public: void initCmdLineGrids(); void resetGrids(); // grid list management - bool isReadyToLogin(){return mReadyToLogin;} + bool isReadyToLogin() const {return mReadyToLogin;} // add a grid to the list of grids void addGrid(const std::string& loginuri); diff --git a/indra/newview/fslslbridge.h b/indra/newview/fslslbridge.h index 630c98a4be..a7efb1ec7e 100644 --- a/indra/newview/fslslbridge.h +++ b/indra/newview/fslslbridge.h @@ -77,19 +77,19 @@ public: void processAttach(LLViewerObject* object, const LLViewerJointAttachment* attachment); void processDetach(LLViewerObject* object, const LLViewerJointAttachment* attachment); - bool getBridgeCreating() { return mBridgeCreating; }; + bool getBridgeCreating() const { return mBridgeCreating; }; void setBridgeCreating(bool status) { mBridgeCreating = status; }; void setBridge(LLViewerInventoryItem* item) { mpBridge = item; }; - LLViewerInventoryItem* getBridge() { return mpBridge; }; + LLViewerInventoryItem* getBridge() const { return mpBridge; }; bool canUseBridge(); bool isBridgeValid() const { return nullptr != mpBridge; } void checkBridgeScriptName(); - std::string currentFullName() { return mCurrentFullName; } + std::string currentFullName() const { return mCurrentFullName; } - LLUUID getBridgeFolder() { return mBridgeFolderID; } - LLUUID getAttachedID() { return mBridgeUUID; } + LLUUID getBridgeFolder() const { return mBridgeFolderID; } + LLUUID getAttachedID() const { return mBridgeUUID; } bool canDetach(const LLUUID& item_id); @@ -97,10 +97,10 @@ public: void setTimerResult(TimerResult result); // from LLVOInventoryListener - virtual void inventoryChanged(LLViewerObject* object, - LLInventoryObject::object_list_t* inventory, - S32 serial_num, - void* user_data); + void inventoryChanged(LLViewerObject* object, + LLInventoryObject::object_list_t* inventory, + S32 serial_num, + void* user_data) override; private: std::string mCurrentURL; diff --git a/indra/newview/fsnearbychathub.h b/indra/newview/fsnearbychathub.h index 9c59cdd334..bd2c9fbfe2 100644 --- a/indra/newview/fsnearbychathub.h +++ b/indra/newview/fsnearbychathub.h @@ -39,8 +39,6 @@ class FSNearbyChat : public LLSingleton LLSINGLETON(FSNearbyChat); ~FSNearbyChat(); - void sendMsg(); - static S32 sLastSpecialChatChannel; FSNearbyChatControl* mDefaultChatBar; diff --git a/indra/newview/llavatarpropertiesprocessor.h b/indra/newview/llavatarpropertiesprocessor.h index 3538de13b9..10cde35f9c 100644 --- a/indra/newview/llavatarpropertiesprocessor.h +++ b/indra/newview/llavatarpropertiesprocessor.h @@ -216,10 +216,6 @@ public: void sendAvatarGroupsRequest(const LLUUID& avatar_id); void sendAvatarTexturesRequest(const LLUUID& avatar_id); void sendAvatarClassifiedsRequest(const LLUUID& avatar_id); - // enable legacy profile access for OpenSim to work with new profile - void sendGenericRequestLegacy(const LLUUID& avatar_id, EAvatarProcessorType type, const std::string method); - void sendAvatarPropertiesRequestLegacy(const LLUUID& avatar_id); - // // Duplicate pick info requests are not suppressed. void sendPickInfoRequest(const LLUUID& creator_id, const LLUUID& pick_id); diff --git a/indra/newview/llchicletbar.h b/indra/newview/llchicletbar.h index 710491f36a..44dbf76697 100644 --- a/indra/newview/llchicletbar.h +++ b/indra/newview/llchicletbar.h @@ -49,11 +49,11 @@ public: ~LLChicletBar(); // LLIMSessionObserver observe triggers - /*virtual*/ void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, BOOL has_offline_msg); - /*virtual*/ void sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) {} - /*virtual*/ void sessionVoiceOrIMStarted(const LLUUID& session_id) {}; - /*virtual*/ void sessionRemoved(const LLUUID& session_id); - /*virtual*/ void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id); + /*virtual*/ void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, BOOL has_offline_msg) override; + /*virtual*/ void sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) override {} + /*virtual*/ void sessionVoiceOrIMStarted(const LLUUID& session_id) override {}; + /*virtual*/ void sessionRemoved(const LLUUID& session_id) override; + /*virtual*/ void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id) override; S32 getTotalUnreadIMCount(); diff --git a/indra/newview/lltoolcomp.h b/indra/newview/lltoolcomp.h index ec50d32a7a..7b462c1525 100644 --- a/indra/newview/lltoolcomp.h +++ b/indra/newview/lltoolcomp.h @@ -168,8 +168,8 @@ public: static void pickCallback(const LLPickInfo& pick_info); // Add middle mouse control for switching uniform scaling on the fly - virtual BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleMiddleMouseUp(S32 x, S32 y, MASK mask); + virtual BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask) override; + virtual BOOL handleMiddleMouseUp(S32 x, S32 y, MASK mask) override; // }; diff --git a/indra/newview/lltoolface.h b/indra/newview/lltoolface.h index 654c9baec8..d5b6da3d95 100644 --- a/indra/newview/lltoolface.h +++ b/indra/newview/lltoolface.h @@ -48,8 +48,8 @@ public: static void pickCallback(const LLPickInfo& pick_info); // Add control to drag texture faces around - virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); - virtual void stopGrabbing(); + virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask) override; + void stopGrabbing(); static BOOL mTextureGrabbed; static LLViewerObject* mTextureObject; diff --git a/indra/newview/qtoolalign.h b/indra/newview/qtoolalign.h index ca3da4fa56..6fae2a7e82 100644 --- a/indra/newview/qtoolalign.h +++ b/indra/newview/qtoolalign.h @@ -19,12 +19,12 @@ class QToolAlign : public LLTool, public LLSingleton virtual ~QToolAlign(); public: - virtual void handleSelect(); - virtual void handleDeselect(); - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleHover(S32 x, S32 y, MASK mask); - virtual void render(); - virtual BOOL canAffectSelection(); + virtual void handleSelect() override; + virtual void handleDeselect() override; + virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask) override; + virtual BOOL handleHover(S32 x, S32 y, MASK mask) override; + virtual void render() override; + BOOL canAffectSelection(); static void pickCallback(const LLPickInfo& pick_info); diff --git a/indra/newview/rlvinventory.h b/indra/newview/rlvinventory.h index 482a308392..cf57a84bb1 100644 --- a/indra/newview/rlvinventory.h +++ b/indra/newview/rlvinventory.h @@ -41,7 +41,7 @@ class RlvInventory : public LLSingleton, public LLInventoryObserve public: // LLInventoryObserver override - /*virtual*/ void changed(U32 mask); + /*virtual*/ void changed(U32 mask) override; /* * #RLV Shared inventory diff --git a/indra/newview/utilitybar.h b/indra/newview/utilitybar.h index f1bab26fe8..d58a24082c 100644 --- a/indra/newview/utilitybar.h +++ b/indra/newview/utilitybar.h @@ -39,7 +39,7 @@ class UtilityBar public: void init(); - virtual BOOL tick(); + virtual BOOL tick() override; void setAOInterfaceButtonExpanded(bool expanded); void setVolumeControlsButtonExpanded(bool expanded);