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/sidepanel_appearance.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/sidepanel_appearance.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/sidepanel_appearance.xml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml index 8dd7bfec42..c2e99b5573 100644 --- a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Vestiario" name="appearance panel"> <string name="No Outfit" value="Nessun vestiario"/> - <filter_editor label="Filtri per il vestiario" name="Filter"/> - <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Mostra opzioni addizionali"/> - <button name="newlook_btn" tool_tip="Aggiungi nuovo vestiario"/> - <dnd_button name="trash_btn" tool_tip="Rimuovi l'articolo selezionato"/> - <button label="Indossa" name="wear_btn"/> + <panel name="panel_currentlook"> + <text name="currentlook_title"> + (non salvato) + </text> </panel> + <filter_editor label="Filtri per il vestiario" name="Filter"/> </panel> |