summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-05-28 12:49:29 +0300
committerIgor Borovkov <iborovkov@productengine.com>2010-05-28 12:49:29 +0300
commit959e4c40cc4366729635829c5deb9d23035321b6 (patch)
treeea39041de07142b4ff250dc33a5dcd0796f1e565
parentba59f71d5e1469f79494a50c647d929a63888685 (diff)
EXT-7208 PARTIAL FIXED fixed tattoo texture pickers, repositioned tattoo color picker
- assigned callbacks for tattoo texture pickers - repositioned tattoo color picker Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/453/ --HG-- branch : product-engine
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_tattoo.xml19
1 files changed, 14 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
index 6d02dd41de..6fa9383507 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
@@ -32,7 +32,10 @@
name="Head Tattoo"
tool_tip="Click to choose a picture"
top="10"
- width="94" />
+ width="94" >
+ <texture_picker.commit_callback
+ function="TexturePicker.Commit" />
+ </texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@@ -44,7 +47,10 @@
name="Upper Tattoo"
tool_tip="Click to choose a picture"
top="10"
- width="94" />
+ width="94" >
+ <texture_picker.commit_callback
+ function="TexturePicker.Commit" />
+ </texture_picker>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@@ -56,17 +62,20 @@
name="Lower Tattoo"
tool_tip="Click to choose a picture"
top_pad="10"
- width="94" />
+ width="94" >
+ <texture_picker.commit_callback
+ function="TexturePicker.Commit" />
+ </texture_picker>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="80"
label="Color/Tint"
layout="topleft"
- left_pad="20"
+ left_pad="45"
name="Color/Tint"
tool_tip="Click to open color picker"
- top="10"
+ top_delta="10"
width="64" >
<color_swatch.commit_callback
function="ColorSwatch.Commit" />