QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3

svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql

1 files changed, 65 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/it/menu_inventory.xml b/indra/newview/skins/default/xui/it/menu_inventory.xml
new file mode 100644
index 0000000000..396390e209
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_inventory.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<menu name="Popup">

+	<menu_item_call label="Compra" name="Task Buy"/>

+	<menu_item_call label="Apri" name="Task Open"/>

+	<menu_item_call label="Esegui" name="Task Play"/>

+	<menu_item_call label="Proprietà" name="Task Properties"/>

+	<menu_item_call label="Rinomina" name="Task Rename"/>

+	<menu_item_call label="Elimina" name="Task Remove"/>

+	<menu_item_call label="Svuota il Cestino" name="Empty Trash"/>

+	<menu_item_call label="Svuota gli oggetti persi e ritrovati" name="Empty Lost And Found"/>

+	<menu_item_call label="Nuova Cartella" name="New Folder"/>

+	<menu_item_call label="Nuovo Script" name="New Script"/>

+	<menu_item_call label="Nuova Notecard" name="New Note"/>

+	<menu_item_call label="Nuova Gesture" name="New Gesture"/>

+	<menu name="New Clothes">

+		<menu_item_call label="Nuova Maglietta" name="New Shirt"/>

+		<menu_item_call label="Nuovi Pantaloni" name="New Pants"/>

+		<menu_item_call label="Nuove Scarpe" name="New Shoes"/>

+		<menu_item_call label="Nuove Calze" name="New Socks"/>

+		<menu_item_call label="Nuova Giacca" name="New Jacket"/>

+		<menu_item_call label="Nuova Gonna" name="New Skirt"/>

+		<menu_item_call label="Nuovi Guanti" name="New Gloves"/>

+		<menu_item_call label="Nuova Canottiera" name="New Undershirt"/>

+		<menu_item_call label="Nuove Mutande" name="New Underpants"/>

+	</menu>

+	<menu name="New Body Parts">

+		<menu_item_call label="Nuova Forma del corpo" name="New Shape"/>

+		<menu_item_call label="Nuova Pelle" name="New Skin"/>

+		<menu_item_call label="Nuovi Capelli" name="New Hair"/>

+		<menu_item_call label="Nuovi Occhi" name="New Eyes"/>

+	</menu>

+	<menu_item_call label="Teletrasportati" name="Landmark Open"/>

+	<menu_item_call label="Apri" name="Animation Open"/>

+	<menu_item_call label="Apri" name="Sound Open"/>

+	<menu_item_call label="Elimina oggetto" name="Purge Item"/>

+	<menu_item_call label="Ripristina oggetto" name="Restore Item"/>

+	<menu_item_call label="Apri" name="Open"/>

+	<menu_item_call label="Proprietà" name="Properties"/>

+	<menu_item_call label="Rinomina" name="Rename"/>

+	<menu_item_call label="Copia UUID dell&apos;oggetto" name="Copy Asset UUID"/>

+	<menu_item_call label="Copia" name="Copy"/>

+	<menu_item_call label="Incolla" name="Paste"/>

+	<menu_item_call label="Cancella" name="Delete"/>

+	<menu_item_call label="Togli gli oggetti" name="Take Off Items"/>

+	<menu_item_call label="Aggiungi all&apos;outfit" name="Add To Outfit"/>

+	<menu_item_call label="Sostituisci outfit" name="Replace Outfit"/>

+	<menu_item_call label="Inizia la conferenza chat" name="Conference Chat Folder"/>

+	<menu_item_call label="Esegui" name="Sound Play"/>

+	<menu_item_call label="Informazioni sul landmark" name="Teleport To Landmark"/>

+	<menu_item_call label="Esegui inworld" name="Animation Play"/>

+	<menu_item_call label="Esegui localmente" name="Animation Audition"/>

+	<menu_item_call label="Invia un Instant Message" name="Send Instant Message"/>

+	<menu_item_call label="Offri teletrasporto..." name="Offer Teleport..."/>

+	<menu_item_call label="Inizia una conferenza chat" name="Conference Chat"/>

+	<menu_item_call label="Attiva" name="Activate"/>

+	<menu_item_call label="Disattiva" name="Deactivate"/>

+	<menu_item_call label="Stacca da te" name="Detach From Yourself"/>

+	<menu_item_call label="Indossa" name="Object Wear"/>

+	<menu label="Attacca a" name="Attach To"/>

+	<menu label="Attacca all&apos;HUD" name="Attach To HUD"/>

+	<menu_item_call label="Modifica" name="Wearable Edit"/>

+	<menu_item_call label="Indossa" name="Wearable Wear"/>

+	<menu_item_call label="Togli" name="Take Off"/>

+	<menu_item_call label="--nessuna opzione--" name="--no options--"/>

+</menu>