Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/newview/llfloaterlandholdings.cpp b/indra/newview/llfloaterlandholdings.cpp
index d33756c53b..63c05b14f8 100644
--- a/indra/newview/llfloaterlandholdings.cpp
+++ b/indra/newview/llfloaterlandholdings.cpp
@@ -60,24 +60,24 @@ LLFloaterLandHoldings::LLFloaterLandHoldings(const LLSD& key)
 :   LLFloater(key),
     mActualArea(0),
     mBillableArea(0),
-    mFirstPacketReceived(FALSE),
+    mFirstPacketReceived(false),
     mSortColumn(""),
-    mSortAscending(TRUE)
+    mSortAscending(true)
 {
 }
 
-BOOL LLFloaterLandHoldings::postBuild()
+bool LLFloaterLandHoldings::postBuild()
 {
     childSetAction("Teleport", onClickTeleport, this);
     childSetAction("Show on Map", onClickMap, this);
 
     // Grant list
     LLScrollListCtrl* grant_list = getChild<LLScrollListCtrl>("grant list");
-    grant_list->sortByColumnIndex(0, TRUE);
+    grant_list->sortByColumnIndex(0, true);
     grant_list->setDoubleClickCallback(onGrantList, this);
 
-    S32 count = gAgent.mGroups.size();
-    for(S32 i = 0; i < count; ++i)
+    auto count = gAgent.mGroups.size();
+    for(size_t i = 0; i < count; ++i)
     {
         LLUUID id(gAgent.mGroups.at(i).mID);
         LLUIString areastr = getString("area_string");
@@ -99,7 +99,7 @@ BOOL LLFloaterLandHoldings::postBuild()
 
     center();
 
-    return TRUE;
+    return true;
 }
 
 
@@ -139,10 +139,10 @@ void LLFloaterLandHoldings::draw()
 void LLFloaterLandHoldings::refresh()
 {
     LLCtrlSelectionInterface *list = childGetSelectionInterface("parcel list");
-    BOOL enable_btns = FALSE;
+    bool enable_btns = false;
     if (list && list->getFirstSelectedIndex()> -1)
     {
-        enable_btns = TRUE;
+        enable_btns = true;
     }
 
     getChildView("Teleport")->setEnabled(enable_btns);
@@ -183,7 +183,7 @@ void LLFloaterLandHoldings::processPlacesReply(LLMessageSystem* msg, void**)
     // If this is the first packet, clear out the "loading..." indicator
     if (!self->mFirstPacketReceived)
     {
-        self->mFirstPacketReceived = TRUE;
+        self->mFirstPacketReceived = true;
         list->operateOnAll(LLCtrlSelectionInterface::OP_DELETE);
     }