Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llfloaterlandholdings.h b/indra/newview/llfloaterlandholdings.h
index 7e99c9e671..d8a823e49c 100644
--- a/indra/newview/llfloaterlandholdings.h
+++ b/indra/newview/llfloaterlandholdings.h
@@ -41,7 +41,7 @@ public:
     LLFloaterLandHoldings(const LLSD& key);
     virtual ~LLFloaterLandHoldings();
 
-    virtual BOOL postBuild();
+    virtual bool postBuild();
     virtual void onOpen(const LLSD& key);
     virtual void draw();
 
@@ -69,10 +69,10 @@ protected:
 
     // Has a packet of data been received?
     // Used to clear out the mParcelList's "Loading..." indicator
-    BOOL mFirstPacketReceived;
+    bool mFirstPacketReceived;
 
     std::string mSortColumn;
-    BOOL mSortAscending;
+    bool mSortAscending;
 };
 
 #endif