diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2010-05-19 12:16:20 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2010-05-19 12:16:20 -0400 |
| commit | 46fc55fca546ee8ac0db8cf69b136bc3e344eed1 (patch) | |
| tree | 47ebc8806fb3f088e9d0f05d2e11abc97c6d6c06 /indra/newview/skins | |
| parent | b550bb0f09197c35b80d18d540761a7831c3e89b (diff) | |
EXT-7208 FIX add color / tint to tattoos
Adds a color swatch to tattoo wearable that allows users to color their tattoos.
Defaults to white so should not affect existing tattoo wearables.
Code reviewed by Vir.
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_edit_tattoo.xml | 14 |
1 files changed, 14 insertions, 0 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 ed990eb095..6d02dd41de 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml @@ -57,6 +57,20 @@ tool_tip="Click to choose a picture" top_pad="10" width="94" /> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="20" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="64" > + <color_swatch.commit_callback + function="ColorSwatch.Commit" /> + </color_swatch> </panel> </panel> |