diff options
| author | Eugene Mutavchi <emutavchi@productengine.com> | 2010-04-28 14:50:33 +0300 |
|---|---|---|
| committer | Eugene Mutavchi <emutavchi@productengine.com> | 2010-04-28 14:50:33 +0300 |
| commit | 6d3c960525afda3bcdb7ef3e58b67ae1bd4a4dd3 (patch) | |
| tree | 5788efbef2d29c001f295f34aa06efebf894e666 /indra/newview/llpaneleditwearable.h | |
| parent | e8540593e6bfd17f86b76dcfcac9442cea9a8cb6 (diff) | |
Implemented major task EXT-6979 (Connect wearable editor texture and color editors to the textures stored in the wearables themselves):
- added PickerControlEntry - dictionary entry which contains information about particular picker control
- added ColorSwatchCtrls and TextureCtrls - lists of PickerControlEntries, contain information about color and texture controls for particular EWearableType
- implemented some helper functions for picker management
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/327/
--HG--
branch : product-engine
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 |