1 files changed, 24 insertions, 24 deletions

diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index d235877988..5915c6c8b8 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -77,7 +77,7 @@ public:
 
     /*virtual*/ void onOpen(const LLSD& key);
     /*virtual*/ void onClose(bool app_quitting);
-    /*virtual*/ BOOL postBuild();
+    /*virtual*/ bool postBuild();
 
     static void processEstateOwnerRequest(LLMessageSystem* msg, void**);
 
@@ -144,10 +144,10 @@ public:
     virtual bool refreshFromRegion(LLViewerRegion* region);
     virtual bool estateUpdate(LLMessageSystem* msg) { return true; }
 
-    virtual BOOL postBuild();
+    virtual bool postBuild();
     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();
@@ -155,9 +155,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;
@@ -187,13 +187,13 @@ public:
     virtual bool refreshFromRegion(LLViewerRegion* region);
 
     // LLPanel
-    virtual BOOL postBuild();
+    virtual bool postBuild();
 
     void onBtnSet();
     void setObjBonusFactor(F32 object_bonus_factor) {mObjBonusFactor = object_bonus_factor;}
 
 protected:
-    virtual BOOL sendUpdate();
+    virtual bool sendUpdate();
     void onClickKick();
     void onKickCommit(const uuid_vec_t& ids);
     static void onClickKickAll(void* userdata);
@@ -215,12 +215,12 @@ public:
         :   LLPanelRegionInfo(), mTargetAvatar() {}
     ~LLPanelRegionDebugInfo() {}
     // LLPanel
-    virtual BOOL postBuild();
+    virtual bool postBuild();
 
     virtual bool refreshFromRegion(LLViewerRegion* region);
 
 protected:
-    virtual BOOL sendUpdate();
+    virtual bool sendUpdate();
 
     void onClickChooseAvatar();
     void callbackAvatarID(const uuid_vec_t& ids, const std::vector<LLAvatarName> names);
@@ -247,17 +247,17 @@ public:
     LLPanelRegionTerrainInfo() : LLPanelRegionInfo() {}
     ~LLPanelRegionTerrainInfo() {}
 
-    virtual BOOL postBuild();                                               // LLPanel
+    virtual bool postBuild();                                               // LLPanel
 
     virtual 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();
-    BOOL validateTextureHeights();
+    bool validateTextureSizes();
+    bool validateTextureHeights();
 
     //static void onChangeAnything(LLUICtrl* ctrl, void* userData);         // callback for any change, to enable commit button
 
-    virtual BOOL sendUpdate();
+    virtual bool sendUpdate();
 
     static void onClickDownloadRaw(void*);
     static void onClickUploadRaw(void*);
@@ -307,7 +307,7 @@ public:
     virtual bool estateUpdate(LLMessageSystem* msg);
 
     // LLPanel
-    virtual BOOL postBuild();
+    virtual bool postBuild();
     virtual void updateChild(LLUICtrl* child_ctrl);
     virtual void refresh();
 
@@ -319,14 +319,14 @@ public:
     void setOwnerName(const std::string& name);
 
 protected:
-    virtual BOOL sendUpdate();
+    virtual bool sendUpdate();
     // 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;
 };
@@ -340,14 +340,14 @@ public:
     ~LLPanelEstateCovenant() {}
 
     // LLPanel
-    virtual BOOL postBuild();
+    virtual bool postBuild();
     virtual void updateChild(LLUICtrl* child_ctrl);
     virtual bool refreshFromRegion(LLViewerRegion* region);
     virtual bool estateUpdate(LLMessageSystem* msg);
 
     // 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);
     static bool confirmChangeCovenantCallback(const LLSD& notification, const LLSD& response);
@@ -382,7 +382,7 @@ public:
     } EAssetStatus;
 
 protected:
-    virtual BOOL sendUpdate();
+    virtual bool sendUpdate();
     LLTextBox*              mEstateNameText;
     LLTextBox*              mEstateOwnerText;
     LLTextBox*              mLastModifiedText;
@@ -401,8 +401,8 @@ class LLPanelRegionExperiences : public LLPanelRegionInfo
 
 public:
     LLPanelRegionExperiences(){}
-    /*virtual*/ BOOL postBuild();
-    virtual BOOL sendUpdate();
+    /*virtual*/ bool postBuild();
+    virtual bool sendUpdate();
 
     static bool experienceCoreConfirm(const LLSD& notification, const LLSD& response);
     static void sendEstateExperienceDelta(U32 flags, const LLUUID& agent_id);
@@ -435,7 +435,7 @@ class LLPanelEstateAccess : public LLPanelRegionInfo
 public:
     LLPanelEstateAccess();
 
-    virtual BOOL postBuild();
+    virtual bool postBuild();
     virtual void updateChild(LLUICtrl* child_ctrl);
 
     void updateControls(LLViewerRegion* region);
@@ -486,7 +486,7 @@ private:
     void copyListToClipboard(std::string list_name);
 
     bool mPendingUpdate;
-    BOOL mCtrlsEnabled;
+    bool mCtrlsEnabled;
 };
 
 #endif