From adc0aba2dd206e76a41298727794ab80754d439b Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 11 May 2010 15:08:29 -0400 Subject: EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType Refactored LLWearableDictionary to look more like LLAssetType/LLFolderType/etc. in terms of code design. This required a lot of superficial changes across many files. Overall functionality has not changed. --- indra/newview/llpaneleditwearable.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpaneleditwearable.h') diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h index 76b0ddb3cc..1fed77cf91 100644 --- a/indra/newview/llpaneleditwearable.h +++ b/indra/newview/llpaneleditwearable.h @@ -71,7 +71,7 @@ private: void showWearable(LLWearable* wearable, BOOL show); void initializePanel(); void updateScrollingPanelUI(); - LLPanel* getPanel(EWearableType type); + LLPanel* getPanel(LLWearableType::EType type); void getSortedParams(value_map_t &sorted_params, const std::string &edit_group); void buildParamList(LLScrollingPanelList *panel_list, value_map_t &sorted_params, LLAccordionCtrlTab *tab); // update bottom bar buttons ("Save", "Revert", etc) @@ -79,7 +79,7 @@ private: void onColorSwatchCommit(const LLUICtrl*); void onTexturePickerCommit(const LLUICtrl*); - void updatePanelPickerControls(EWearableType type); + void updatePanelPickerControls(LLWearableType::EType type); // the pointer to the wearable we're editing. NULL means we're not editing a wearable. LLWearable *mWearablePtr; -- cgit v1.2.3 From bf8ee428136b4c38500fb72642d0f75b24057f60 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 11 May 2010 15:24:27 -0400 Subject: EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType Name change LLWearableDictionary.h to LLWearableType.h. --- indra/newview/llpaneleditwearable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpaneleditwearable.h') diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h index 1fed77cf91..876b22f0a5 100644 --- a/indra/newview/llpaneleditwearable.h +++ b/indra/newview/llpaneleditwearable.h @@ -36,7 +36,7 @@ #include "llpanel.h" #include "llscrollingpanellist.h" #include "llmodaldialog.h" -#include "llwearabledictionary.h" +#include "llwearabletype.h" class LLWearable; class LLTextEditor; -- cgit v1.2.3 From b24dfb72c54ccf98b8854fa5270e0b28106ad5cb Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Tue, 11 May 2010 23:04:43 +0300 Subject: EXT-7206 FIXED Shape editing panel: implemented displaying avatar height in meters. Changes: - Now displaying (continuously refreshed) avatar height in the shape editing panel. - Updated avatar avatar sex switching radio buttons according to the spec (icons, size, position). - Fixed position, text and font color of the "Shape:" label. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/367/ --HG-- branch : product-engine --- indra/newview/llpaneleditwearable.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llpaneleditwearable.h') diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h index 76b0ddb3cc..35c5ddade1 100644 --- a/indra/newview/llpaneleditwearable.h +++ b/indra/newview/llpaneleditwearable.h @@ -80,6 +80,8 @@ private: void onColorSwatchCommit(const LLUICtrl*); void onTexturePickerCommit(const LLUICtrl*); void updatePanelPickerControls(EWearableType type); + void toggleTypeSpecificControls(EWearableType type); + void updateTypeSpecificControls(EWearableType type); // the pointer to the wearable we're editing. NULL means we're not editing a wearable. LLWearable *mWearablePtr; @@ -91,6 +93,7 @@ private: LLTextBox *mPanelTitle; LLTextBox *mDescTitle; + LLTextBox *mTxtAvatarHeight; // This text editor reference will change each time we edit a new wearable - -- cgit v1.2.3 From 1cee577ca0234eee7da243c85be8eb7524d691c7 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 12 May 2010 11:42:53 +0100 Subject: Oops! I fixed these compile errors but didn't commit them. --- indra/newview/llpaneleditwearable.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpaneleditwearable.h') 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; -- cgit v1.2.3