diff options
Diffstat (limited to 'indra/newview/llwearableitemslist.cpp')
| -rw-r--r-- | indra/newview/llwearableitemslist.cpp | 56 | 
1 files changed, 28 insertions, 28 deletions
| diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp index 187c4ed638..5ee6aec9f9 100644 --- a/indra/newview/llwearableitemslist.cpp +++ b/indra/newview/llwearableitemslist.cpp @@ -60,10 +60,10 @@ bool LLFindOutfitItems::operator()(LLInventoryCategory* cat,             || (item->getType() == LLAssetType::AT_OBJECT)             || (item->getType() == LLAssetType::AT_GESTURE))          { -            return TRUE; +            return true;          }      } -    return FALSE; +    return false;  }  ////////////////////////////////////////////////////////////////////////// @@ -100,7 +100,7 @@ LLPanelWearableOutfitItem::Params::Params()  {  } -BOOL LLPanelWearableOutfitItem::postBuild() +bool LLPanelWearableOutfitItem::postBuild()  {      LLPanelWearableListItem::postBuild(); @@ -115,10 +115,10 @@ BOOL LLPanelWearableOutfitItem::postBuild()          setWidgetsVisible(false);          reshapeWidgets();      } -    return TRUE; +    return true;  } -BOOL LLPanelWearableOutfitItem::handleDoubleClick(S32 x, S32 y, MASK mask) +bool LLPanelWearableOutfitItem::handleDoubleClick(S32 x, S32 y, MASK mask)  {      if(!mShowWidgets)      { @@ -133,7 +133,7 @@ BOOL LLPanelWearableOutfitItem::handleDoubleClick(S32 x, S32 y, MASK mask)      {          onAddWearable();      } -    return TRUE; +    return true;  }  void LLPanelWearableOutfitItem::onAddWearable() @@ -293,7 +293,7 @@ LLPanelClothingListItem::~LLPanelClothingListItem()  {  } -BOOL LLPanelClothingListItem::postBuild() +bool LLPanelClothingListItem::postBuild()  {      LLPanelDeletableWearableListItem::postBuild(); @@ -305,7 +305,7 @@ BOOL LLPanelClothingListItem::postBuild()      setWidgetsVisible(false);      reshapeWidgets(); -    return TRUE; +    return true;  }  ////////////////////////////////////////////////////////////////////////// @@ -370,7 +370,7 @@ LLPanelBodyPartsListItem::~LLPanelBodyPartsListItem()  {  } -BOOL LLPanelBodyPartsListItem::postBuild() +bool LLPanelBodyPartsListItem::postBuild()  {      LLPanelInventoryListItemBase::postBuild(); @@ -380,7 +380,7 @@ BOOL LLPanelBodyPartsListItem::postBuild()      setWidgetsVisible(false);      reshapeWidgets(); -    return TRUE; +    return true;  }  static LLWidgetNameRegistry::StaticRegistrar sRegisterPanelDeletableWearableListItem(&typeid(LLPanelDeletableWearableListItem::Params), "deletable_wearable_list_item"); @@ -413,7 +413,7 @@ LLPanelDeletableWearableListItem::LLPanelDeletableWearableListItem(LLViewerInven      setSeparatorVisible(true);  } -BOOL LLPanelDeletableWearableListItem::postBuild() +bool LLPanelDeletableWearableListItem::postBuild()  {      LLPanelWearableListItem::postBuild(); @@ -426,7 +426,7 @@ BOOL LLPanelDeletableWearableListItem::postBuild()      setWidgetsVisible(false);      reshapeWidgets(); -    return TRUE; +    return true;  } @@ -486,11 +486,11 @@ LLPanelDummyClothingListItem* LLPanelDummyClothingListItem::create(LLWearableTyp      return list_item;  } -BOOL LLPanelDummyClothingListItem::postBuild() +bool LLPanelDummyClothingListItem::postBuild()  {      addWidgetToRightSide("btn_add_panel"); -    setIconImage(LLInventoryIcon::getIcon(LLAssetType::AT_CLOTHING, LLInventoryType::IT_NONE, mWearableType, FALSE)); +    setIconImage(LLInventoryIcon::getIcon(LLAssetType::AT_CLOTHING, LLInventoryType::IT_NONE, mWearableType, false));      updateItem(wearableTypeToString(mWearableType));      // Make it look loke clothing item - reserve space for 'delete' button @@ -499,7 +499,7 @@ BOOL LLPanelDummyClothingListItem::postBuild()      setWidgetsVisible(false);      reshapeWidgets(); -    return TRUE; +    return true;  }  LLWearableType::EType LLPanelDummyClothingListItem::getWearableType() const @@ -959,14 +959,14 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu          return;      } -    const uuid_vec_t& ids = mUUIDs; // selected items IDs -    U32 mask = 0;                   // mask of selected items' types -    U32 n_items = ids.size();       // number of selected items -    U32 n_worn = 0;                 // number of worn items among the selected ones -    U32 n_already_worn = 0;         // number of items worn of same type as selected items -    U32 n_links = 0;                // number of links among the selected items -    U32 n_editable = 0;             // number of editable items among the selected ones -    U32 n_touchable = 0;            // number of touchable items among the selected ones +    const uuid_vec_t& ids = mUUIDs;             // selected items IDs +    U32 mask = 0;                               // mask of selected items' types +    U32 n_items = static_cast<U32>(ids.size()); // number of selected items +    U32 n_worn = 0;                             // number of worn items among the selected ones +    U32 n_already_worn = 0;                     // number of items worn of same type as selected items +    U32 n_links = 0;                            // number of links among the selected items +    U32 n_editable = 0;                         // number of editable items among the selected ones +    U32 n_touchable = 0;                        // number of touchable items among the selected ones      bool can_be_worn = true; @@ -1041,8 +1041,8 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu      setMenuItemEnabled(menu, "take_off_or_detach",  n_worn == n_items);      setMenuItemVisible(menu, "object_profile",      !standalone);      setMenuItemEnabled(menu, "object_profile",      n_items == 1); -    setMenuItemVisible(menu, "--no options--",      FALSE); -    setMenuItemEnabled(menu, "--no options--",      FALSE); +    setMenuItemVisible(menu, "--no options--",      false); +    setMenuItemEnabled(menu, "--no options--",      false);      // Populate or hide the "Attach to..." / "Attach to HUD..." submenus.      if (mask == MASK_ATTACHMENT && n_worn == 0) @@ -1071,7 +1071,7 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu      }      if (num_visible_items == 0)      { -        setMenuItemVisible(menu, "--no options--", TRUE); +        setMenuItemVisible(menu, "--no options--", true);      }  } @@ -1091,8 +1091,8 @@ void LLWearableItemsList::ContextMenu::updateItemsLabels(LLContextMenu* menu)      menu_item->setLabel(new_label);  } -// We need this method to convert non-zero BOOL values to exactly 1 (TRUE). -// Otherwise code relying on a BOOL value being TRUE may fail +// We need this method to convert non-zero bool values to exactly 1 (true). +// Otherwise code relying on a bool value being true may fail  // (I experienced a weird assert in LLView::drawChildren() because of that.  // static  void LLWearableItemsList::ContextMenu::setMenuItemVisible(LLContextMenu* menu, const std::string& name, bool val) | 
