livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing overrides

master
Ansariel 2024-03-02 13:25:43 +01:00
parent 073c5e4da5
commit a3c5a72cfd
10 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/fsgridhandler.h
View File

@ -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);

18
indra/newview/fslslbridge.h
View File

@ -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;

2
indra/newview/fsnearbychathub.h
View File

@ -39,8 +39,6 @@ class FSNearbyChat : public LLSingleton<FSNearbyChat>
LLSINGLETON(FSNearbyChat);
~FSNearbyChat();
void sendMsg();
static S32 sLastSpecialChatChannel;
FSNearbyChatControl* mDefaultChatBar;

4
indra/newview/llavatarpropertiesprocessor.h
View File

@ -216,10 +216,6 @@ public:
void sendAvatarGroupsRequest(const LLUUID& avatar_id);
void sendAvatarTexturesRequest(const LLUUID& avatar_id);
void sendAvatarClassifiedsRequest(const LLUUID& avatar_id);
// <FS:Beq> 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);
// </FS:Beq>
// Duplicate pick info requests are not suppressed.
void sendPickInfoRequest(const LLUUID& creator_id, const LLUUID& pick_id);

10
indra/newview/llchicletbar.h
View File

@ -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();

4
indra/newview/lltoolcomp.h
View File

@ -168,8 +168,8 @@ public:
static void pickCallback(const LLPickInfo& pick_info);
// <FS:Zi> 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;
// </FS:Zi>
};

4
indra/newview/lltoolface.h
View File

@ -48,8 +48,8 @@ public:
static void pickCallback(const LLPickInfo& pick_info);
// <FS:Zi> 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;

12
indra/newview/qtoolalign.h
View File

@ -19,12 +19,12 @@ class QToolAlign : public LLTool, public LLSingleton<QToolAlign>
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);

2
indra/newview/rlvinventory.h
View File

@ -41,7 +41,7 @@ class RlvInventory : public LLSingleton<RlvInventory>, public LLInventoryObserve
public:
// LLInventoryObserver override
/*virtual*/ void changed(U32 mask);
/*virtual*/ void changed(U32 mask) override;
/*
* #RLV Shared inventory

2
indra/newview/utilitybar.h
View File

@ -39,7 +39,7 @@ class UtilityBar
public:
void init();
virtual BOOL tick();
virtual BOOL tick() override;
void setAOInterfaceButtonExpanded(bool expanded);
void setVolumeControlsButtonExpanded(bool expanded);