diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2010-05-19 19:49:50 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2010-05-19 19:49:50 -0400 |
| commit | b9096fc954d615a9eff44c3e9bfe1c7d9cadd87a (patch) | |
| tree | cfbba634d4ef9b9ba40e00e8dee179a7423b199c /indra/newview/skins/default | |
| parent | 8c4ec8ac9da1845a4aa78a6a38f64b5fc17b2a90 (diff) | |
| parent | 8487341b0f255e65044c3f7e3dc09461b4e2351e (diff) | |
automated merge with viewer-public
Diffstat (limited to 'indra/newview/skins/default')
| -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> |