summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-01 15:52:13 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-01 15:52:13 +0100
commitf13b30848bb224695e9708ab61742c6d86d29935 (patch)
tree01a10ce4ea660b719cbca9544917b46af7628692 /indra/newview/skins/default/xui/en/panel_edit_skirt.xml
parent5ab2d0755578b4129b532f67a78d780be039fed0 (diff)
parent0cbdad70611201a94b9550598e61067faa1fac6b (diff)
merge from viewer-trunk
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_edit_skirt.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_skirt.xml10
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
index 16f6950bd5..87f3270b31 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_skirt.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"