summaryrefslogtreecommitdiff
path: root/indra/newview/llpaneleditwearable.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-12 10:55:19 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-12 10:55:19 +0100
commit7059173aa920e9c8d1939a0ec9558fc79cbfb3ed (patch)
tree1e66e2083ad73fcdbc0a76ecf95c33fb20bc63ee /indra/newview/llpaneleditwearable.h
parent489a5eb9e20256da64749e85254b9511e0919607 (diff)
parent9ab4d2ca8be2edcafa6cdfc3bd774ebaed444dc8 (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llpaneleditwearable.h')
-rw-r--r--indra/newview/llpaneleditwearable.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h
index 876b22f0a5..cb22891196 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(LLWearableType::EType 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 -