summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_edit_socks.xml
diff options
context:
space:
mode:
authorEugene Mutavchi <emutavchi@productengine.com>2010-04-28 14:50:33 +0300
committerEugene Mutavchi <emutavchi@productengine.com>2010-04-28 14:50:33 +0300
commit6d3c960525afda3bcdb7ef3e58b67ae1bd4a4dd3 (patch)
tree5788efbef2d29c001f295f34aa06efebf894e666 /indra/newview/skins/default/xui/en/panel_edit_socks.xml
parente8540593e6bfd17f86b76dcfcac9442cea9a8cb6 (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/skins/default/xui/en/panel_edit_socks.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_socks.xml10
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_socks.xml b/indra/newview/skins/default/xui/en/panel_edit_socks.xml
index e4f916703b..5bd99969a2 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_socks.xml
@@ -32,7 +32,10 @@
name="Fabric"
tool_tip="Click to choose a picture"
top="10"
- width="64" />
+ width="64" >
+ <texture_picker.commit_callback
+ function="TexturePicker.Commit" />
+ </texture_picker>
<color_swatch
can_apply_immediately="true"
follows="left|top"
@@ -43,7 +46,10 @@
name="Color/Tint"
tool_tip="Click to open color picker"
top="10"
- width="64" />
+ width="64" >
+ <color_swatch.commit_callback
+ function="ColorSwatch.Commit" />
+ </color_swatch>
</panel>
<panel
border="false"