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

DRTVWR-592: Use overrides, make mac build happy

meow-7.2.2
Cosmic Linden 2023-10-13 09:56:39 -07:00
parent 6e36bbae74
commit a2f384984e
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
indra/newview/llfloaterregioninfo.h
View File

@ -75,9 +75,9 @@ class LLFloaterRegionInfo : public LLFloater
public:
/*virtual*/ void onOpen(const LLSD& key);
void onOpen(const LLSD& key) override;
/*virtual*/ void onClose(bool app_quitting);
/*virtual*/ BOOL postBuild();
BOOL postBuild() override;
static void processEstateOwnerRequest(LLMessageSystem* msg, void**);
@ -98,7 +98,7 @@ public:
static LLPanelRegionEnvironment* getPanelEnvironment();
// from LLPanel
virtual void refresh();
void refresh() override;
void onRegionChanged();
void requestRegionInfo();
@ -145,7 +145,7 @@ public:
virtual bool refreshFromRegion(LLViewerRegion* region);
virtual bool estateUpdate(LLMessageSystem* msg) { return true; }
virtual BOOL postBuild();
BOOL postBuild() override;
virtual void updateChild(LLUICtrl* child_ctrl);
void enableButton(const std::string& btn_name, BOOL enable = TRUE);
@ -185,16 +185,15 @@ public:
: LLPanelRegionInfo() {}
~LLPanelRegionGeneralInfo() {}
virtual bool refreshFromRegion(LLViewerRegion* region);
bool refreshFromRegion(LLViewerRegion* region) override;
// LLPanel
virtual BOOL postBuild();
BOOL postBuild() override;
void onBtnSet();
void setObjBonusFactor(F32 object_bonus_factor) {mObjBonusFactor = object_bonus_factor;}
protected:
virtual BOOL sendUpdate();
BOOL sendUpdate() override;
void onClickKick();
void onKickCommit(const uuid_vec_t& ids);
static void onClickKickAll(void* userdata);
@ -215,13 +214,13 @@ public:
LLPanelRegionDebugInfo()
: LLPanelRegionInfo(), mTargetAvatar() {}
~LLPanelRegionDebugInfo() {}
// LLPanel
virtual BOOL postBuild();
BOOL postBuild() override;
virtual bool refreshFromRegion(LLViewerRegion* region);
bool refreshFromRegion(LLViewerRegion* region) override;
protected:
virtual BOOL sendUpdate();
BOOL sendUpdate() override;
void onClickChooseAvatar();
void callbackAvatarID(const uuid_vec_t& ids, const std::vector<LLAvatarName> names);
@ -248,9 +247,9 @@ public:
LLPanelRegionTerrainInfo() : LLPanelRegionInfo() {}
~LLPanelRegionTerrainInfo() {}
virtual BOOL postBuild(); // LLPanel
BOOL postBuild() override;
virtual bool refreshFromRegion(LLViewerRegion* region); // refresh local settings from region update from simulator
bool refreshFromRegion(LLViewerRegion* region); // refresh local settings from region update from simulator
void setEnvControls(bool available); // Whether environment settings are available for this region
BOOL validateTextureSizes();
@ -261,14 +260,15 @@ public:
void refresh() override;
void onSelectMaterialType();
virtual BOOL sendUpdate();
static void onClickDownloadRaw(void*);
static void onClickUploadRaw(void*);
static void onClickBakeTerrain(void*);
bool callbackBakeTerrain(const LLSD& notification, const LLSD& response);
bool callbackTextureHeights(const LLSD& notification, const LLSD& response);
protected:
BOOL sendUpdate() override;
private:
bool mConfirmedTextureHeights;
bool mAskedTextureHeights;
@ -307,13 +307,12 @@ public:
static void updateEstateName(const std::string& name);
static void updateEstateOwnerName(const std::string& name);
virtual bool refreshFromRegion(LLViewerRegion* region);
bool refreshFromRegion(LLViewerRegion* region) override;
virtual bool estateUpdate(LLMessageSystem* msg);
// LLPanel
virtual BOOL postBuild();
BOOL postBuild() override;
virtual void updateChild(LLUICtrl* child_ctrl);
virtual void refresh();
void refresh() override;
void refreshFromEstate();
@ -323,7 +322,7 @@ public:
void setOwnerName(const std::string& name);
protected:
virtual BOOL sendUpdate();
BOOL sendUpdate() override;
// confirmation dialog callback
bool callbackChangeLindenEstate(const LLSD& notification, const LLSD& response);
@ -343,10 +342,9 @@ public:
LLPanelEstateCovenant();
~LLPanelEstateCovenant() {}
// LLPanel
virtual BOOL postBuild();
BOOL postBuild() override;
virtual void updateChild(LLUICtrl* child_ctrl);
virtual bool refreshFromRegion(LLViewerRegion* region);
bool refreshFromRegion(LLViewerRegion* region) override;
virtual bool estateUpdate(LLMessageSystem* msg);
// LLView overrides
@ -386,7 +384,7 @@ public:
} EAssetStatus;
protected:
virtual BOOL sendUpdate();
BOOL sendUpdate() override;
LLTextBox* mEstateNameText;
LLTextBox* mEstateOwnerText;
LLTextBox* mLastModifiedText;
@ -405,16 +403,19 @@ class LLPanelRegionExperiences : public LLPanelRegionInfo
public:
LLPanelRegionExperiences(){}
/*virtual*/ BOOL postBuild();
virtual BOOL sendUpdate();
BOOL postBuild() override;
static bool experienceCoreConfirm(const LLSD& notification, const LLSD& response);
static void sendEstateExperienceDelta(U32 flags, const LLUUID& agent_id);
static void infoCallback(LLHandle<LLPanelRegionExperiences> handle, const LLSD& content);
bool refreshFromRegion(LLViewerRegion* region);
bool refreshFromRegion(LLViewerRegion* region) override;
void sendPurchaseRequest()const;
void processResponse( const LLSD& content );
protected:
BOOL sendUpdate() override;
private:
void refreshRegionExperiences();
@ -439,7 +440,7 @@ class LLPanelEstateAccess : public LLPanelRegionInfo
public:
LLPanelEstateAccess();
virtual BOOL postBuild();
BOOL postBuild() override;
virtual void updateChild(LLUICtrl* child_ctrl);
void updateControls(LLViewerRegion* region);
@ -448,7 +449,7 @@ public:
void setPendingUpdate(bool pending) { mPendingUpdate = pending; }
bool getPendingUpdate() { return mPendingUpdate; }
virtual bool refreshFromRegion(LLViewerRegion* region);
bool refreshFromRegion(LLViewerRegion* region) override;
private:
void onClickAddAllowedAgent();