Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge

1 files changed, 23 insertions, 23 deletions

diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index da17212016..f0731d517a 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -79,7 +79,7 @@ public:
 
 	void onOpen(const LLSD& key) override;
 	void onClose(bool app_quitting) override;
-	BOOL postBuild() override;
+    bool postBuild() override;
 
 	static void processEstateOwnerRequest(LLMessageSystem* msg, void**);
 
@@ -146,10 +146,10 @@ public:
 	virtual bool refreshFromRegion(LLViewerRegion* region);
 	virtual bool estateUpdate(LLMessageSystem* msg) { return true; }
 	
-	BOOL postBuild() override;
+    bool postBuild() override;
 	virtual void updateChild(LLUICtrl* child_ctrl);
 	
-	void enableButton(const std::string& btn_name, BOOL enable = TRUE);
+	void enableButton(const std::string& btn_name, bool enable = true);
 	void disableButton(const std::string& btn_name);
 	
 	void onClickManageTelehub();
@@ -157,9 +157,9 @@ public:
 protected:
 	void initCtrl(const std::string& name);
 	
-	// Returns TRUE if update sent and apply button should be
+	// Returns true if update sent and apply button should be
 	// disabled.
-	virtual BOOL sendUpdate() { return TRUE; }
+	virtual bool sendUpdate() { return true; }
 	
 	typedef std::vector<std::string> strings_t;
 	//typedef std::vector<U32> integers_t;
@@ -188,13 +188,13 @@ public:
 	
 	bool refreshFromRegion(LLViewerRegion* region) override;
 	
-	BOOL postBuild() override;
+    bool postBuild() override;
 	
 	void onBtnSet();
 	void setObjBonusFactor(F32 object_bonus_factor) {mObjBonusFactor = object_bonus_factor;}
 
 protected:
-	BOOL sendUpdate() override;
+	bool sendUpdate() override;
 	void onClickKick();
 	void onKickCommit(const uuid_vec_t& ids);
 	static void onClickKickAll(void* userdata);
@@ -216,12 +216,12 @@ public:
 		:	LLPanelRegionInfo(), mTargetAvatar() {}
 	~LLPanelRegionDebugInfo() {}
 
-	BOOL postBuild() override;
+    bool postBuild() override;
 	
 	bool refreshFromRegion(LLViewerRegion* region) override;
 	
 protected:
-	BOOL sendUpdate() override;
+    bool sendUpdate() override;
 
 	void onClickChooseAvatar();
 	void callbackAvatarID(const uuid_vec_t& ids, const std::vector<LLAvatarName> names);
@@ -248,14 +248,14 @@ public:
 	LLPanelRegionTerrainInfo();
 	~LLPanelRegionTerrainInfo() {}
 	
-	BOOL postBuild() override;
+    bool postBuild() override;
 	
     bool refreshFromRegion(LLViewerRegion* region) override;                // refresh local settings from region update from simulator
 	void setEnvControls(bool available);									// Whether environment settings are available for this region
 
     bool validateTextureSizes();
     bool validateMaterials();
-	BOOL validateTextureHeights();
+    bool validateTextureHeights();
 
 	//static void onChangeAnything(LLUICtrl* ctrl, void* userData);			// callback for any change, to enable commit button
 	
@@ -269,7 +269,7 @@ public:
 	bool callbackTextureHeights(const LLSD& notification, const LLSD& response);
 
 protected:
-	BOOL sendUpdate() override;
+    bool sendUpdate() override;
 
 private:
 	bool mConfirmedTextureHeights;
@@ -317,7 +317,7 @@ public:
 	bool refreshFromRegion(LLViewerRegion* region) override;
 	bool estateUpdate(LLMessageSystem* msg) override;
 	
-	BOOL postBuild() override;
+    bool postBuild() override;
 	void updateChild(LLUICtrl* child_ctrl) override;
 	void refresh() override;
 
@@ -329,14 +329,14 @@ public:
 	void setOwnerName(const std::string& name);
 
 protected:
-	BOOL sendUpdate() override;
+    bool sendUpdate() override;
 	// confirmation dialog callback
 	bool callbackChangeLindenEstate(const LLSD& notification, const LLSD& response);
 
 	void commitEstateAccess();
 	void commitEstateManagers();
 	
-	BOOL checkSunHourSlider(LLUICtrl* child_ctrl);
+	bool checkSunHourSlider(LLUICtrl* child_ctrl);
 
 	U32 mEstateID;
 };
@@ -349,14 +349,14 @@ public:
 	LLPanelEstateCovenant();
 	~LLPanelEstateCovenant() {}
 	
-	BOOL postBuild() override;
+    bool postBuild() override;
 	void updateChild(LLUICtrl* child_ctrl) override;
 	bool refreshFromRegion(LLViewerRegion* region) override;
 	bool estateUpdate(LLMessageSystem* msg) override;
 
 	// LLView overrides
-	BOOL handleDragAndDrop(S32 x, S32 y, MASK mask,
-						   BOOL drop, EDragAndDropType cargo_type,
+	bool handleDragAndDrop(S32 x, S32 y, MASK mask,
+						   bool drop, EDragAndDropType cargo_type,
 						   void *cargo_data, EAcceptance *accept,
 						   std::string& tooltip_msg) override;
 	static bool confirmChangeCovenantCallback(const LLSD& notification, const LLSD& response);
@@ -391,7 +391,7 @@ public:
 	} EAssetStatus;
 
 protected:
-	BOOL sendUpdate() override;
+    bool sendUpdate() override;
 	LLTextBox*				mEstateNameText;
 	LLTextBox*				mEstateOwnerText;
 	LLTextBox*				mLastModifiedText;
@@ -410,7 +410,7 @@ class LLPanelRegionExperiences : public LLPanelRegionInfo
 
 public:
 	LLPanelRegionExperiences(){}
-	BOOL postBuild() override;
+    bool postBuild() override;
 	
 	static bool experienceCoreConfirm(const LLSD& notification, const LLSD& response);
 	static void sendEstateExperienceDelta(U32 flags, const LLUUID& agent_id);
@@ -421,7 +421,7 @@ public:
 	void processResponse( const LLSD& content );
 
 protected:
-	BOOL sendUpdate() override;
+    bool sendUpdate() override;
 
 private:
 	void refreshRegionExperiences();
@@ -447,7 +447,7 @@ class LLPanelEstateAccess : public LLPanelRegionInfo
 public:
 	LLPanelEstateAccess();
 
-	BOOL postBuild() override;
+    bool postBuild() override;
 	void updateChild(LLUICtrl* child_ctrl) override;
 
 	void updateControls(LLViewerRegion* region);
@@ -498,7 +498,7 @@ private:
 	void copyListToClipboard(std::string list_name);
 
 	bool mPendingUpdate;
-	BOOL mCtrlsEnabled;
+	bool mCtrlsEnabled;
 };
 
 #endif