diff options
author | Aimee Linden <aimee@lindenlab.com> | 2010-04-29 02:38:39 +0100 |
---|---|---|
committer | Aimee Linden <aimee@lindenlab.com> | 2010-04-29 02:38:39 +0100 |
commit | b90ece0936149a69b1176adc4ae2508c61e34fd7 (patch) | |
tree | 4295b0d766fd6cc80afccac4b689134741b5bb0e /indra/newview/llpaneleditwearable.h | |
parent | 46897efc3efade25feaaa1dc67bc131c35202d12 (diff) | |
parent | 8c3feea2a2f3bcb648f712f63ea9c4dab8aaa0c3 (diff) |
Merge
Diffstat (limited to 'indra/newview/llpaneleditwearable.h')
-rw-r--r-- | indra/newview/llpaneleditwearable.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h index 8b63685177..76b0ddb3cc 100644 --- a/indra/newview/llpaneleditwearable.h +++ b/indra/newview/llpaneleditwearable.h @@ -77,6 +77,10 @@ private: // update bottom bar buttons ("Save", "Revert", etc) void updateVerbs(); + void onColorSwatchCommit(const LLUICtrl*); + void onTexturePickerCommit(const LLUICtrl*); + void updatePanelPickerControls(EWearableType type); + // the pointer to the wearable we're editing. NULL means we're not editing a wearable. LLWearable *mWearablePtr; LLViewerInventoryItem* mWearableItem; @@ -112,7 +116,6 @@ private: LLPanel *mPanelSkirt; LLPanel *mPanelAlpha; LLPanel *mPanelTattoo; - }; #endif |