Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h
index d024de199f..3560304566 100644
--- a/indra/newview/llfloaterland.h
+++ b/indra/newview/llfloaterland.h
@@ -82,7 +82,7 @@ public:
     LLParcel* getCurrentSelectedParcel();
 
     virtual void onOpen(const LLSD& key);
-    virtual BOOL postBuild();
+    virtual bool postBuild();
 
 private:
     // Does its own instance management, so clients not allowed
@@ -130,7 +130,7 @@ public:
     // we send an update to the simulator, it usually replies with the
     // parcel information, causing the land to be reselected.  This allows
     // us to suppress that behavior.
-    static BOOL sRequestReplyOnUpdate;
+    static bool sRequestReplyOnUpdate;
 };
 
 
@@ -153,7 +153,7 @@ public:
     static void onClickRelease(void*);
     static void onClickReclaim(void*);
     static void onClickBuyPass(void* deselect_when_done);
-    static BOOL enableBuyPass(void*);
+    static bool enableBuyPass(void*);
     static void onCommitAny(LLUICtrl* ctrl, void *userdata);
     static void finalizeCommit(void * userdata);
     static void onForSaleChange(LLUICtrl *ctrl, void * userdata);
@@ -175,10 +175,10 @@ public:
     static void confirmSaleChange(S32 landSize, S32 salePrice, std::string authorizedName, void(*callback)(void*), void* userdata);
     static void callbackConfirmSaleChange(S32 option, void* userdata);
 
-    virtual BOOL postBuild();
+    virtual bool postBuild();
 
 protected:
-    BOOL            mUncheckedSell; // True only when verifying land information when land is for sale on sale info change
+    bool            mUncheckedSell; // True only when verifying land information when land is for sale on sale info change
 
     LLTextBox*      mLabelName;
     LLLineEditor*   mEditName;
@@ -274,7 +274,7 @@ public:
     static void onCommitClean(LLUICtrl* caller, void* user_data);
     static void processParcelObjectOwnersReply(LLMessageSystem *msg, void **);
 
-    virtual BOOL postBuild();
+    virtual bool postBuild();
 
 protected:
 
@@ -302,12 +302,12 @@ protected:
     LLPointer<LLUIImage>    mIconAvatarOffline;
     LLPointer<LLUIImage>    mIconGroup;
 
-    BOOL            mFirstReply;
+    bool            mFirstReply;
 
     uuid_list_t     mSelectedOwners;
     std::string     mSelectedName;
     S32             mSelectedCount;
-    BOOL            mSelectedIsGroup;
+    bool            mSelectedIsGroup;
 
     LLSafeHandle<LLParcelSelection>&    mParcel;
 };
@@ -319,7 +319,7 @@ class LLPanelLandOptions
 public:
     LLPanelLandOptions(LLSafeHandle<LLParcelSelection>& parcelp);
     virtual ~LLPanelLandOptions();
-    /*virtual*/ BOOL postBuild();
+    /*virtual*/ bool postBuild();
     /*virtual*/ void draw();
     /*virtual*/ void refresh();
 
@@ -378,7 +378,7 @@ public:
     static void onClickRemoveAccess(void*);
     static void onClickRemoveBanned(void*);
 
-    virtual BOOL postBuild();
+    virtual bool postBuild();
 
     void onClickAddAccess();
     void onClickAddBanned();
@@ -400,7 +400,7 @@ class LLPanelLandCovenant
 public:
     LLPanelLandCovenant(LLSafeHandle<LLParcelSelection>& parcelp);
     virtual ~LLPanelLandCovenant();
-    virtual BOOL postBuild();
+    virtual bool postBuild();
     void refresh();
     static void updateCovenantText(const std::string& string);
     static void updateEstateName(const std::string& name);