merge changes for latest viewer-development

7 files changed, 15 insertions, 17 deletions

diff --git a/indra/newview/skins/default/xui/it/floater_buy_land.xml b/indra/newview/skins/default/xui/it/floater_buy_land.xml
index f3b30f7048..3940c43a3d 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_land.xml
@@ -142,10 +142,10 @@ consente [AMOUNT2] oggetti
 	<text name="estate_name_text">
 		(sconosciuto)
 	</text>
-	<text name="estate_owner_label" right="575" width="120">
+	<text name="estate_owner_label">
 		Proprietario della regione:
 	</text>
-	<text left="580" name="estate_owner_text" width="155">
+	<text name="estate_owner_text">
 		(sconosciuto)
 	</text>
 	<text name="resellable_changeable_label">
diff --git a/indra/newview/skins/default/xui/it/floater_sell_land.xml b/indra/newview/skins/default/xui/it/floater_sell_land.xml
index 0f8d24ebbd..106ae0373c 100644
--- a/indra/newview/skins/default/xui/it/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_sell_land.xml
@@ -55,7 +55,7 @@
 				<radio_item label="Si, vendi gli oggetti con la terra" name="yes"/>
 			</radio_group>
 			<button label="Mostra oggetti" name="show_objects"/>
-			<text name="nag_message_label">
+			<text name="nag_message_label" font="SansSerifSmallBold" left="9">
 				RICORDA: Tutte le vendite sono definitive.
 			</text>
 			<button label="Imposta terreno come in vendita" name="sell_btn"/>
diff --git a/indra/newview/skins/default/xui/it/floater_top_objects.xml b/indra/newview/skins/default/xui/it/floater_top_objects.xml
index 939c5e83a0..7d062db23b 100644
--- a/indra/newview/skins/default/xui/it/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/it/floater_top_objects.xml
@@ -39,13 +39,13 @@
 	<text name="id_text">
 		ID oggetto:
 	</text>
-	<line_editor font="SansSerifSmall" left="90" name="id_editor" width="280"/>
-	<button label="Mostra segnali luminosi" name="show_beacon_btn" width="150"/>
+	<line_editor font="SansSerifSmall" name="id_editor"/>
+	<button label="Mostra segnali luminosi" name="show_beacon_btn"/>
 	<text name="obj_name_text">
 		Nome dell&apos;oggetto:
 	</text>
-	<line_editor font="SansSerifSmall" left="90" name="object_name_editor" width="280"/>
-	<button label="Filtro" name="filter_object_btn" width="150"/>
+	<line_editor font="SansSerifSmall" name="object_name_editor"/>
+	<button label="Filtro" name="filter_object_btn"/>
 	<text name="owner_name_text">
 		Proprietario:
 	</text>
diff --git a/indra/newview/skins/default/xui/it/floater_water.xml b/indra/newview/skins/default/xui/it/floater_water.xml
index c6ab646fbf..b25f0a6266 100644
--- a/indra/newview/skins/default/xui/it/floater_water.xml
+++ b/indra/newview/skins/default/xui/it/floater_water.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Water Floater" title="EDITOR AVANZATO DELL&apos;ACQUA">
-	<text name="KeyFramePresetsText" width="224">
+	<text name="KeyFramePresetsText" width="245">
 		Impostazioni predeterminate dell&apos;acqua:
 	</text>
-	<combo_box left_delta="230" name="WaterPresetsCombo" width="150"/>
+	<combo_box left_delta="245" name="WaterPresetsCombo" width="150"/>
 	<button label="Nuovo" label_selected="Nuovo" name="WaterNewPreset"/>
 	<button label="Salva" label_selected="Salva" name="WaterSavePreset"/>
 	<button label="Cancella" label_selected="Cancella" name="WaterDeletePreset"/>
diff --git a/indra/newview/skins/default/xui/it/floater_windlight_options.xml b/indra/newview/skins/default/xui/it/floater_windlight_options.xml
index 1f6f0fab58..6828d05be0 100644
--- a/indra/newview/skins/default/xui/it/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/it/floater_windlight_options.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="WindLight floater" title="EDITOR AVANZATO DEL CIELO">
-	<text name="KeyFramePresetsText">
+	<text name="KeyFramePresetsText" width="105">
 		Cieli predefiniti:
 	</text>
+	<combo_box left_delta="105" name="WLPresetsCombo"/>
 	<button label="Nuovo" label_selected="Nuovo" name="WLNewPreset"/>
 	<button label="Salva" label_selected="Salva" left_delta="72" name="WLSavePreset"/>
 	<button label="Elimina" label_selected="Elimina" left_delta="72" name="WLDeletePreset"/>
diff --git a/indra/newview/skins/default/xui/it/panel_group_notices.xml b/indra/newview/skins/default/xui/it/panel_group_notices.xml
index 2e2f0dc7b0..524f7d2822 100644
--- a/indra/newview/skins/default/xui/it/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_notices.xml
@@ -25,18 +25,15 @@ Massimo 200 per gruppo al giorno
 		<text name="lbl">
 			Crea una notice
 		</text>
-		<text left="20" name="lbl3">
+		<text name="lbl3">
 			Oggetto:
 		</text>
-		<line_editor left_delta="61" name="create_subject" width="251"/>
-		<text left="15" name="lbl4" width="60">
+		<text name="lbl4">
 			Messaggio:
 		</text>
-		<text_editor left_delta="66" name="create_message" width="330"/>
-		<text name="lbl5" width="68">
+		<text name="lbl5">
 			Allega:
 		</text>
-		<line_editor left_delta="74" name="create_inventory_name" width="190"/>
 		<text name="string">
 			Trascina e rilascia qui l&apos;oggetto da allegare:
 		</text>
diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_general.xml b/indra/newview/skins/default/xui/it/panel_media_settings_general.xml
index 5ed7b23679..f11b2415ee 100644
--- a/indra/newview/skins/default/xui/it/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_media_settings_general.xml
@@ -22,7 +22,7 @@
 	<text name="media_setting_note">
 		Nota: I residenti possono annullare questa impostazione
 	</text>
-	<check_box initial_value="false" label="Messa in scala automatica dell&apos;elemento multimediale sulla faccia dell&apos;oggetto" name="auto_scale"/>
+	<check_box initial_value="false" label="Messa in scala automatica dell&apos;elemento multimediale sulla &#10;faccia dell&apos;oggetto" name="auto_scale"/>
 	<text name="size_label">
 		Dimensioni:
 	</text>