diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-13 17:30:42 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-13 17:30:42 -0700 |
| commit | 99c115696fadfd4197d93b9b1b6cfb2d0ffb14c5 (patch) | |
| tree | 857e9b14bcdd8822a6fdd3c964602cc5adb2152c /indra/newview/llpaneleditwearable.h | |
| parent | 2af4875309450fa3d3e266426ada12330489a8c9 (diff) | |
| parent | 669953f6950000821c33e77d4c29ef0c905667f9 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpaneleditwearable.h')
| -rw-r--r-- | indra/newview/llpaneleditwearable.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h index 76b0ddb3cc..a5a332019d 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; @@ -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,9 @@ private: void onColorSwatchCommit(const LLUICtrl*); void onTexturePickerCommit(const LLUICtrl*); - void updatePanelPickerControls(EWearableType type); + void updatePanelPickerControls(LLWearableType::EType 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; @@ -91,6 +93,7 @@ private: LLTextBox *mPanelTitle; LLTextBox *mDescTitle; + LLTextBox *mTxtAvatarHeight; // This text editor reference will change each time we edit a new wearable - |