1 files changed, 16 insertions, 16 deletions

diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index cd866f1625..1799968afb 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -48,7 +48,7 @@ LLFlatListView::Params::Params()
     no_items_text("no_items_text")
 {};
 
-void LLFlatListView::reshape(S32 width, S32 height, BOOL called_from_parent /* = TRUE */)
+void LLFlatListView::reshape(S32 width, S32 height, bool called_from_parent /* = true */)
 {
     S32 delta = height - getRect().getHeight();
     LLScrollContainer::reshape(width, height, called_from_parent);
@@ -390,7 +390,7 @@ U32 LLFlatListView::size(const bool only_visible_items) const
     }
     else
     {
-        return mItemPairs.size();
+        return static_cast<U32>(mItemPairs.size());
     }
 }
 
@@ -528,7 +528,7 @@ void LLFlatListView::draw()
 }
 
 // virtual
-BOOL LLFlatListView::postBuild()
+bool LLFlatListView::postBuild()
 {
     setTabStop(true);
     return LLScrollContainer::postBuild();
@@ -563,7 +563,7 @@ void LLFlatListView::rearrangeItems()
     }
 
     // add paddings between items, excluding invisible ones
-    height += mItemPad * (mItemPairs.size() - invisible_children_count - 1);
+    height += mItemPad * (static_cast<S32>(mItemPairs.size()) - invisible_children_count - 1);
 
     LLRect rc = mItemsPanel->getRect();
     S32 width = mItemsNoScrollWidth;
@@ -610,7 +610,7 @@ void LLFlatListView::onItemMouseClick(item_pair_t* item_pair, MASK mask)
         return;
     }
 
-    setFocus(TRUE);
+    setFocus(true);
 
     bool select_item = !isSelected(item_pair);
 
@@ -714,10 +714,10 @@ void LLFlatListView::onItemRightMouseClick(item_pair_t* item_pair, MASK mask)
     onItemMouseClick(item_pair, mask);
 }
 
-BOOL LLFlatListView::handleKeyHere(KEY key, MASK mask)
+bool LLFlatListView::handleKeyHere(KEY key, MASK mask)
 {
-    BOOL reset_selection = (mask != MASK_SHIFT);
-    BOOL handled = FALSE;
+    bool reset_selection = (mask != MASK_SHIFT);
+    bool handled = false;
     switch (key)
     {
         case KEY_RETURN:
@@ -725,7 +725,7 @@ BOOL LLFlatListView::handleKeyHere(KEY key, MASK mask)
             if (mSelectedItemPairs.size() && mask == MASK_NONE)
             {
                 mOnReturnSignal(this, getValue());
-                handled = TRUE;
+                handled = true;
             }
             break;
         }
@@ -753,7 +753,7 @@ BOOL LLFlatListView::handleKeyHere(KEY key, MASK mask)
         {
             if (mask == MASK_NONE)
             {
-                setFocus(FALSE); // pass focus to the game area (EXT-8357)
+                setFocus(false); // pass focus to the game area (EXT-8357)
             }
             break;
         }
@@ -779,7 +779,7 @@ BOOL LLFlatListView::handleKeyHere(KEY key, MASK mask)
         localRectToScreen(selected_rc, &screen_rc);
         notifyParent(LLSD().with("scrollToShowRect",screen_rc.getValue()));*/
 
-        handled = TRUE;
+        handled = true;
     }
 
     return handled ? handled : LLScrollContainer::handleKeyHere(key, mask);
@@ -1040,7 +1040,7 @@ bool LLFlatListView::selectNextItemPair(bool is_up_direction, bool reset_selecti
     return false;
 }
 
-BOOL LLFlatListView::canSelectAll() const
+bool LLFlatListView::canSelectAll() const
 {
     return 0 != size() && mAllowSelection && mMultipleSelection;
 }
@@ -1198,14 +1198,14 @@ void LLFlatListView::onFocusReceived()
 {
     if (size())
     {
-        mSelectedItemsBorder->setVisible(TRUE);
+        mSelectedItemsBorder->setVisible(true);
     }
     gEditMenuHandler = this;
 }
 // virtual
 void LLFlatListView::onFocusLost()
 {
-    mSelectedItemsBorder->setVisible(FALSE);
+    mSelectedItemsBorder->setVisible(false);
     // Route menu back to the default
     if (gEditMenuHandler == this)
     {
@@ -1376,7 +1376,7 @@ bool LLFlatListViewEx::updateItemVisibility(LLPanel* item, const LLSD &action)
     if (!item)
         return false;
 
-    BOOL visible = TRUE;
+    bool visible = true;
 
     // 0 signifies that filter is matched,
     // i.e. we don't hide items that don't support 'match_filter' action, separators etc.
@@ -1390,7 +1390,7 @@ bool LLFlatListViewEx::updateItemVisibility(LLPanel* item, const LLSD &action)
         if (!mForceShowingUnmatchedItems)
         {
             selectItem(item, false);
-            visible = FALSE;
+            visible = false;
         }
     }