summaryrefslogtreecommitdiff
path: root/indra/newview/llwearableitemslist.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llwearableitemslist.cpp')
-rw-r--r--indra/newview/llwearableitemslist.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index dbea7b556d..d29d38018b 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -180,7 +180,7 @@ BOOL LLPanelBodyPartsListItem::postBuild()
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
-LLPanelDummyClothingListItem* LLPanelDummyClothingListItem::create(EWearableType w_type)
+LLPanelDummyClothingListItem* LLPanelDummyClothingListItem::create(LLWearableType::EType w_type)
{
LLPanelDummyClothingListItem* list_item = new LLPanelDummyClothingListItem(w_type);
list_item->init();
@@ -213,7 +213,7 @@ BOOL LLPanelDummyClothingListItem::postBuild()
return TRUE;
}
-LLPanelDummyClothingListItem::LLPanelDummyClothingListItem(EWearableType w_type)
+LLPanelDummyClothingListItem::LLPanelDummyClothingListItem(LLWearableType::EType w_type)
: LLPanelWearableListItem(NULL)
, mWearableType(w_type)
{
@@ -224,26 +224,26 @@ void LLPanelDummyClothingListItem::init()
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_dummy_clothing_list_item.xml");
}
-typedef std::map<EWearableType, std::string> clothing_to_string_map_t;
+typedef std::map<LLWearableType::EType, std::string> clothing_to_string_map_t;
clothing_to_string_map_t init_clothing_string_map()
{
clothing_to_string_map_t w_map;
- w_map.insert(std::make_pair(WT_SHIRT, "shirt_not_worn"));
- w_map.insert(std::make_pair(WT_PANTS, "pants_not_worn"));
- w_map.insert(std::make_pair(WT_SHOES, "shoes_not_worn"));
- w_map.insert(std::make_pair(WT_SOCKS, "socks_not_worn"));
- w_map.insert(std::make_pair(WT_JACKET, "jacket_not_worn"));
- w_map.insert(std::make_pair(WT_GLOVES, "gloves_not_worn"));
- w_map.insert(std::make_pair(WT_UNDERSHIRT, "undershirt_not_worn"));
- w_map.insert(std::make_pair(WT_UNDERPANTS, "underpants_not_worn"));
- w_map.insert(std::make_pair(WT_SKIRT, "skirt_not_worn"));
- w_map.insert(std::make_pair(WT_ALPHA, "alpha_not_worn"));
- w_map.insert(std::make_pair(WT_TATTOO, "tattoo_not_worn"));
+ w_map.insert(std::make_pair(LLWearableType::WT_SHIRT, "shirt_not_worn"));
+ w_map.insert(std::make_pair(LLWearableType::WT_PANTS, "pants_not_worn"));
+ w_map.insert(std::make_pair(LLWearableType::WT_SHOES, "shoes_not_worn"));
+ w_map.insert(std::make_pair(LLWearableType::WT_SOCKS, "socks_not_worn"));
+ w_map.insert(std::make_pair(LLWearableType::WT_JACKET, "jacket_not_worn"));
+ w_map.insert(std::make_pair(LLWearableType::WT_GLOVES, "gloves_not_worn"));
+ w_map.insert(std::make_pair(LLWearableType::WT_UNDERSHIRT, "undershirt_not_worn"));
+ w_map.insert(std::make_pair(LLWearableType::WT_UNDERPANTS, "underpants_not_worn"));
+ w_map.insert(std::make_pair(LLWearableType::WT_SKIRT, "skirt_not_worn"));
+ w_map.insert(std::make_pair(LLWearableType::WT_ALPHA, "alpha_not_worn"));
+ w_map.insert(std::make_pair(LLWearableType::WT_TATTOO, "tattoo_not_worn"));
return w_map;
}
-std::string LLPanelDummyClothingListItem::wearableTypeToString(EWearableType w_type)
+std::string LLPanelDummyClothingListItem::wearableTypeToString(LLWearableType::EType w_type)
{
static const clothing_to_string_map_t w_map = init_clothing_string_map();
static const std::string invalid_str = LLTrans::getString("invalid_not_worn");