diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-01 11:04:15 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-01 11:04:15 -0700 |
| commit | 359fb947411654e7d345709448db6ff316551d96 (patch) | |
| tree | 2514f1c31ce39ee63559f0c88c4b5ac6d85299b8 /indra/newview/skins/default/xui/pt/floater_color_picker.xml | |
| parent | 3069355a6f33b7bbcfc8c493910a40e6836249e1 (diff) | |
Sync up with a number of SVN changes that snuck in via weird merges
Diffstat (limited to 'indra/newview/skins/default/xui/pt/floater_color_picker.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/pt/floater_color_picker.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/pt/floater_color_picker.xml b/indra/newview/skins/default/xui/pt/floater_color_picker.xml index 475280b013..95dd53ccd4 100644 --- a/indra/newview/skins/default/xui/pt/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/pt/floater_color_picker.xml @@ -19,12 +19,14 @@ Lum: </text> <check_box label="Aplicar imediatamente" name="apply_immediate"/> - <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/> + <button left_delta="150" name="color_pipette" /> + <button left_delta="55" label="Cancelar" label_selected="Cancelar" name="cancel_btn"/> <button label="Selecionar" label_selected="Selecionar" name="select_btn"/> <text name="Current color:"> Cor atual: </text> <text name="(Drag below to save.)"> - (Arraste abaixo para salvar.) + (Arraste abaixo + para salvar.) </text> </floater> |