summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-03-24 18:04:26 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-03-24 18:04:26 +0200
commitd3a606f8323a32c660c71675257e3abd95cb097e (patch)
tree11e272b194cb42bd9b11b861395f44793d3fa9f6 /indra/newview/skins/default/xui/it/floater_preview_gesture.xml
parent5f46430a1aa16212838dd7a9493a42fcb5e92ec3 (diff)
parent7857f59f9e7c673f1ddbf32d6a66e85f78004445 (diff)
Manual merge from default branch.
Resolved conflicts in llpanellandmarks.cpp. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/it/floater_preview_gesture.xml')
-rw-r--r--indra/newview/skins/default/xui/it/floater_preview_gesture.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
index 850f4c21ac..41d4fdfce2 100644
--- a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
@@ -24,6 +24,9 @@
<floater.string name="Title">
Gesture: [NAME]
</floater.string>
+ <text name="name_text">
+ Nome:
+ </text>
<text name="desc_label">
Descrizione:
</text>