diff options
author | Igor Borovkov <iborovkov@productengine.com> | 2010-05-28 12:52:40 +0300 |
---|---|---|
committer | Igor Borovkov <iborovkov@productengine.com> | 2010-05-28 12:52:40 +0300 |
commit | d2cc5dd0f5d1b83dd7e995a0c7ed2d4a85c9be94 (patch) | |
tree | 51e72b5efbdb2a5360b90f5ceda143b8595abd06 /indra/newview/skins/default/xui/en | |
parent | a1b973fc2a5d28e64dcf010e3652beda78745d35 (diff) | |
parent | 959e4c40cc4366729635829c5deb9d23035321b6 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_edit_tattoo.xml | 19 |
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" /> |