diff options
| -rw-r--r-- | indra/newview/llpaneleditwearable.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llpaneleditwearable.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index 5aeb3ffc82..557fb399be 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -663,7 +663,7 @@ void LLPanelEditWearable::draw() updateVerbs(); if (getWearable()) { - EWearableType type = getWearable()->getType(); + LLWearableType::EType type = getWearable()->getType(); updatePanelPickerControls(type); updateTypeSpecificControls(type); } @@ -929,21 +929,21 @@ void LLPanelEditWearable::initializePanel() updateVerbs(); } -void LLPanelEditWearable::toggleTypeSpecificControls(EWearableType type) +void LLPanelEditWearable::toggleTypeSpecificControls(LLWearableType::EType type) { // Toggle controls specific to shape editing panel. { - bool is_shape = (type == WT_SHAPE); + bool is_shape = (type == LLWearableType::WT_SHAPE); childSetVisible("sex_radio", is_shape); childSetVisible("female_icon", is_shape); childSetVisible("male_icon", is_shape); } } -void LLPanelEditWearable::updateTypeSpecificControls(EWearableType type) +void LLPanelEditWearable::updateTypeSpecificControls(LLWearableType::EType type) { // Update controls specific to shape editing panel. - if (type == WT_SHAPE) + if (type == LLWearableType::WT_SHAPE) { // Update avatar height std::string avatar_height_str = llformat("%.2f", gAgentAvatarp->mBodySize.mV[VZ]); diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h index cb22891196..a5a332019d 100644 --- a/indra/newview/llpaneleditwearable.h +++ b/indra/newview/llpaneleditwearable.h @@ -80,8 +80,8 @@ private: void onColorSwatchCommit(const LLUICtrl*); void onTexturePickerCommit(const LLUICtrl*); void updatePanelPickerControls(LLWearableType::EType type); - void toggleTypeSpecificControls(EWearableType type); - void updateTypeSpecificControls(EWearableType type); + void toggleTypeSpecificControls(LLWearableType::EType type); + void updateTypeSpecificControls(LLWearableType::EType type); // the pointer to the wearable we're editing. NULL means we're not editing a wearable. LLWearable *mWearablePtr; |