diff options
author | Adam Moss <moss@lindenlab.com> | 2009-05-22 09:58:47 +0000 |
---|---|---|
committer | Adam Moss <moss@lindenlab.com> | 2009-05-22 09:58:47 +0000 |
commit | 9dfe0ca9a0228c4fa75c8a3e51840696cc6b4960 (patch) | |
tree | 3136e0a32cdcb1d55a4c3a5a67791ca128d947a5 /indra/newview/skins/default/xui/it/floater_color_picker.xml | |
parent | 93cf3d89e51835dd2f61c32b16191ab724528055 (diff) |
svn merge -r121194:121210
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1
QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
Diffstat (limited to 'indra/newview/skins/default/xui/it/floater_color_picker.xml')
-rw-r--r-- | indra/newview/skins/default/xui/it/floater_color_picker.xml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/it/floater_color_picker.xml b/indra/newview/skins/default/xui/it/floater_color_picker.xml index a71b75722e..93188c29ac 100644 --- a/indra/newview/skins/default/xui/it/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/it/floater_color_picker.xml @@ -3,28 +3,36 @@ <text name="r_val_text"> Rosso: </text> + <spinner left="84" name="rspin" width="47"/> <text name="g_val_text"> Verde: </text> + <spinner left="84" name="gspin" width="47"/> <text name="b_val_text"> Blu: </text> + <spinner left="84" name="bspin" width="47"/> <text name="h_val_text"> Tonalità: </text> + <spinner left="84" name="hspin" width="47"/> <text name="s_val_text"> Saturazione: </text> + <spinner left="84" name="sspin" width="47"/> <text name="l_val_text"> Luminosità: </text> + <spinner left="84" name="lspin" width="47"/> <check_box label="Applica Immediatamente" name="apply_immediate"/> - <button label="Annulla" label_selected="Annulla" name="cancel_btn"/> + <button left_delta="150" name="color_pipette" /> + <button left_delta="55" label="Annulla" label_selected="Annulla" name="cancel_btn"/> <button label="Seleziona" label_selected="Seleziona" name="select_btn"/> <text name="Current color:"> Colore attuale: </text> <text name="(Drag below to save.)"> - (Trascina qui sotto per salvare.) + (Trascina qui sotto + per salvare.) </text> </floater> |