diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-24 18:04:26 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-24 18:04:26 +0200 |
commit | d3a606f8323a32c660c71675257e3abd95cb097e (patch) | |
tree | 11e272b194cb42bd9b11b861395f44793d3fa9f6 /indra/newview/skins/default/xui/it/panel_edit_shirt.xml | |
parent | 5f46430a1aa16212838dd7a9493a42fcb5e92ec3 (diff) | |
parent | 7857f59f9e7c673f1ddbf32d6a66e85f78004445 (diff) |
Manual merge from default branch.
Resolved conflicts in llpanellandmarks.cpp.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/it/panel_edit_shirt.xml')
-rw-r--r-- | indra/newview/skins/default/xui/it/panel_edit_shirt.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/it/panel_edit_shirt.xml b/indra/newview/skins/default/xui/it/panel_edit_shirt.xml index 5d902ae40b..631d609d60 100644 --- a/indra/newview/skins/default/xui/it/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_shirt.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_shirt_panel"> <panel name="avatar_shirt_color_panel"> - <texture_picker label="Tessuto" name="Fabric" tool_tip="Clicca per scegliere una foto"/> + <texture_picker label="Tessuto" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/> <color_swatch label="Colore/Tinta" name="Color/Tint" tool_tip="Clicca per aprire il selettore dei colori"/> </panel> <accordion name="wearable_accordion"> |