From b37eb2642f6e6e4d1e32a49c7ab31f70321cd979 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 10 Nov 2017 16:17:25 -0800
Subject: Remove delete preset dialog, Initial settings for selection level
 (Region/Parcel/Local)

---
 .../default/xui/de/floater_delete_env_preset.xml   | 35 -------------
 indra/newview/skins/default/xui/de/menu_viewer.xml |  3 --
 .../default/xui/en/floater_delete_env_preset.xml   | 59 ----------------------
 indra/newview/skins/default/xui/en/menu_viewer.xml | 30 -----------
 .../default/xui/es/floater_delete_env_preset.xml   | 35 -------------
 indra/newview/skins/default/xui/es/menu_viewer.xml |  3 --
 .../default/xui/fr/floater_delete_env_preset.xml   | 35 -------------
 indra/newview/skins/default/xui/fr/menu_viewer.xml |  3 --
 .../default/xui/it/floater_delete_env_preset.xml   | 35 -------------
 indra/newview/skins/default/xui/it/menu_viewer.xml |  3 --
 .../default/xui/ja/floater_delete_env_preset.xml   | 35 -------------
 indra/newview/skins/default/xui/ja/menu_viewer.xml |  3 --
 .../default/xui/pl/floater_delete_env_preset.xml   | 35 -------------
 indra/newview/skins/default/xui/pl/menu_viewer.xml |  3 --
 .../default/xui/pt/floater_delete_env_preset.xml   | 35 -------------
 indra/newview/skins/default/xui/pt/menu_viewer.xml |  3 --
 .../default/xui/ru/floater_delete_env_preset.xml   | 35 -------------
 indra/newview/skins/default/xui/ru/menu_viewer.xml |  3 --
 .../default/xui/tr/floater_delete_env_preset.xml   | 35 -------------
 indra/newview/skins/default/xui/tr/menu_viewer.xml |  3 --
 .../default/xui/zh/floater_delete_env_preset.xml   | 35 -------------
 indra/newview/skins/default/xui/zh/menu_viewer.xml |  3 --
 22 files changed, 469 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/de/floater_delete_env_preset.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
 delete mode 100644 indra/newview/skins/default/xui/es/floater_delete_env_preset.xml
 delete mode 100644 indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_delete_env_preset.xml
 delete mode 100644 indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml
 delete mode 100644 indra/newview/skins/default/xui/pl/floater_delete_env_preset.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml
 delete mode 100644 indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml
 delete mode 100644 indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml
 delete mode 100644 indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml
deleted file mode 100644
index cc14ce640d..0000000000
--- a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<floater name="Delete Env Preset" title="UMGEB.VOREINST. LÖSCHEN">
-	<string name="title_water">
-		Wasser-Voreinstellung löschen
-	</string>
-	<string name="title_sky">
-		Himmel-Voreinstellung löschen
-	</string>
-	<string name="title_day_cycle">
-		Tageszyklus löschen
-	</string>
-	<string name="label_water">
-		Voreinstellung:
-	</string>
-	<string name="label_sky">
-		Voreinstellung:
-	</string>
-	<string name="label_day_cycle">
-		Tageszyklus:
-	</string>
-	<string name="msg_confirm_deletion">
-		Möchten Sie die ausgewählte Voreinstellung wirklich löschen?
-	</string>
-	<string name="msg_sky_is_referenced">
-		Eine Voreinstellung, auf die sich ein Tageszyklus bezieht, kann nicht gelöscht werden.
-	</string>
-	<string name="combo_label">
-		-Voreinstellung auswählen-
-	</string>
-	<text name="label">
-		Voreinstellung:
-	</text>
-	<button label="Löschen" name="delete"/>
-	<button label="Abbrechen" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 5feedef965..6233d511cb 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -89,17 +89,14 @@
 			<menu label="Wasser-Voreinstellungen" name="Water Presets">
 				<menu_item_call label="Neue Voreinstellung..." name="new_water_preset"/>
 				<menu_item_call label="Voreinstellung bearbeiten..." name="edit_water_preset"/>
-				<menu_item_call label="Voreinstellung löschen..." name="delete_water_preset"/>
 			</menu>
 			<menu label="Himmel-Voreinstellungen" name="Sky Presets">
 				<menu_item_call label="Neue Voreinstellung..." name="new_sky_preset"/>
 				<menu_item_call label="Voreinstellung bearbeiten..." name="edit_sky_preset"/>
-				<menu_item_call label="Voreinstellung löschen..." name="delete_sky_preset"/>
 			</menu>
 			<menu label="Tag-Voreinstellungen" name="Day Presets">
 				<menu_item_call label="Neue Voreinstellung..." name="new_day_preset"/>
 				<menu_item_call label="Voreinstellung bearbeiten..." name="edit_day_preset"/>
-				<menu_item_call label="Voreinstellung löschen..." name="delete_day_preset"/>
 			</menu>
 		</menu>
 	</menu>
diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
deleted file mode 100644
index b5de4166f6..0000000000
--- a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<floater
- legacy_header_height="18"
- height="130"
- help_topic=""
- layout="topleft"
- name="Delete Env Preset"
- save_rect="true"
- title="DELETE ENV PRESET"
- width="550">
-
-    <string name="title_water">Delete Water Preset</string>
-    <string name="title_sky">Delete Sky Preset</string>
-    <string name="title_day_cycle">Delete Day Cycle</string>
-
-    <string name="label_water">Preset:</string>
-    <string name="label_sky">Preset:</string>
-    <string name="label_day_cycle">Day cycle:</string>
-   
-    <string name="msg_confirm_deletion">Are you sure you want to delete the selected preset?</string>
-    <string name="msg_sky_is_referenced">Cannot remove a preset that is referenced by some day cycle(s).</string>
-
-    <string name="combo_label">-Select a preset-</string>
-
-    <text
-     follows="top|left|right"
-     font="SansSerif"
-     height="10"
-     layout="topleft"
-     left="50"
-     name="label"
-     top="60"
-     width="60">
-     Preset:
-    </text>
-    <combo_box
-     follows="top|left"
-     layout="topleft"
-     left_pad="10"
-     name="preset_combo"
-     top_delta="-5"
-     width="200"/>
-    <button
-     follows="bottom|right"
-     height="23"
-     label="Delete"
-     layout="topleft"
-     left_pad="15"
-     name="delete"
-     width="70"/>
-    <button
-     follows="bottom|right"
-     height="23"
-     label="Cancel"
-     layout="topleft"
-     left_pad="5"
-     name="cancel"
-     width="70"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 92511167c0..551b643dab 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -731,16 +731,6 @@
 	     	 	 	function="World.EnvPreset"
 	     	 	 	parameter="edit_water"/>
 	     	 	</menu_item_call>
-	     	 	<menu_item_call
-	     	 	 label="Delete preset..."
-	     	 	 name="delete_water_preset">
-	     	 	 	<menu_item_call.on_click
-	     	 	 	function="World.EnvPreset"
-	     	 	 	parameter="delete_water"/>
-	     	 	 	<menu_item_call.on_enable
-	     	 	 	function="World.EnableEnvPreset"
-	     	 	 	parameter="delete_water"/>
-	     	 	</menu_item_call>
 	     	</menu>
 	     	
 	     	<menu
@@ -760,16 +750,6 @@
 	     	 	 	function="World.EnvPreset"
 	     	 	 	parameter="edit_sky"/>
 	     	 	</menu_item_call>
-	     	 	<menu_item_call
-	     	 	 label="Delete preset..."
-	     	 	 name="delete_sky_preset">
-	     	 	 	<menu_item_call.on_click
-	     	 	 	function="World.EnvPreset"
-	     	 	 	parameter="delete_sky"/>
-	     	 	 	<menu_item_call.on_enable
-	     	 	 	function="World.EnableEnvPreset"
-	     	 	 	parameter="delete_sky"/>
-	     	 	</menu_item_call>
 	     	</menu>
 	     	
 	     	<menu
@@ -789,16 +769,6 @@
 	     	 	 	function="World.EnvPreset"
 	     	 	 	parameter="edit_day_cycle"/>
 	     	 	</menu_item_call>
-	     	 	<menu_item_call
-	     	 	 label="Delete preset..."
-	     	 	 name="delete_day_preset">
-	     	 	 	<menu_item_call.on_click
-	     	 	 	function="World.EnvPreset"
-	     	 	 	parameter="delete_day_cycle"/>
-	     	 	 	<menu_item_call.on_enable
-	     	 	 	function="World.EnableEnvPreset"
-	     	 	 	parameter="delete_day_cycle"/>
-	     	 	</menu_item_call>
 	     	</menu>
 	    </menu>
     
diff --git a/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml
deleted file mode 100644
index 5e7df8530e..0000000000
--- a/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<floater name="Delete Env Preset" title="ELIMINAR EL ENV PREDEFINIDO">
-	<string name="title_water">
-		Eliminar el agua predefinida
-	</string>
-	<string name="title_sky">
-		Eliminar cielo predefinido
-	</string>
-	<string name="title_day_cycle">
-		Eliminar ciclo del día
-	</string>
-	<string name="label_water">
-		Predefinido:
-	</string>
-	<string name="label_sky">
-		Predefinido:
-	</string>
-	<string name="label_day_cycle">
-		Ciclo del día:
-	</string>
-	<string name="msg_confirm_deletion">
-		¿Estás seguro de que quieres eliminar el valor predefinido seleccionado?
-	</string>
-	<string name="msg_sky_is_referenced">
-		No se puede quitar un valor predefinido al que se hace referencia en otro u otros ciclos del día.
-	</string>
-	<string name="combo_label">
-		-Selecciona un valor predefinido-
-	</string>
-	<text name="label">
-		Predefinido:
-	</text>
-	<button label="Borrar" name="delete"/>
-	<button label="Cancelar" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 447dd2629c..e4ba007221 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -89,17 +89,14 @@
 			<menu label="Agua predefinida" name="Water Presets">
 				<menu_item_call label="Nuevo predefinido..." name="new_water_preset"/>
 				<menu_item_call label="Editar predefinido..." name="edit_water_preset"/>
-				<menu_item_call label="Eliminar predefinido..." name="delete_water_preset"/>
 			</menu>
 			<menu label="Cielos predefinidos" name="Sky Presets">
 				<menu_item_call label="Nuevo predefinido..." name="new_sky_preset"/>
 				<menu_item_call label="Editar predefinido..." name="edit_sky_preset"/>
-				<menu_item_call label="Eliminar predefinido..." name="delete_sky_preset"/>
 			</menu>
 			<menu label="Días predefinidos" name="Day Presets">
 				<menu_item_call label="Nuevo predefinido..." name="new_day_preset"/>
 				<menu_item_call label="Editar predefinido..." name="edit_day_preset"/>
-				<menu_item_call label="Eliminar predefinido..." name="delete_day_preset"/>
 			</menu>
 		</menu>
 	</menu>
diff --git a/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml
deleted file mode 100644
index 035bdbe5f3..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<floater name="Delete Env Preset" title="SUPPRIMER PRÉRÉGLAGE ENV.">
-	<string name="title_water">
-		Supprimer un préréglage de l&apos;eau
-	</string>
-	<string name="title_sky">
-		Supprimer un préréglage du ciel
-	</string>
-	<string name="title_day_cycle">
-		Supprimer un cycle du jour
-	</string>
-	<string name="label_water">
-		Préréglage :
-	</string>
-	<string name="label_sky">
-		Préréglage :
-	</string>
-	<string name="label_day_cycle">
-		Cycle du jour :
-	</string>
-	<string name="msg_confirm_deletion">
-		Voulez-vous vraiment supprimer le préréglage sélectionné ?
-	</string>
-	<string name="msg_sky_is_referenced">
-		Impossible de supprimer un préréglage référencé dans un ou plusieurs cycles du jour.
-	</string>
-	<string name="combo_label">
-		-Effectuer une sélection-
-	</string>
-	<text name="label">
-		Préréglage :
-	</text>
-	<button label="Supprimer" name="delete"/>
-	<button label="Annuler" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 04fa85d488..4594d7edb8 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -89,17 +89,14 @@
 			<menu label="Préréglages de l&apos;eau" name="Water Presets">
 				<menu_item_call label="Nouveau préréglage..." name="new_water_preset"/>
 				<menu_item_call label="Modifier un préréglage..." name="edit_water_preset"/>
-				<menu_item_call label="Supprimer un préréglage..." name="delete_water_preset"/>
 			</menu>
 			<menu label="Préréglages du ciel" name="Sky Presets">
 				<menu_item_call label="Nouveau préréglage..." name="new_sky_preset"/>
 				<menu_item_call label="Modifier un préréglage..." name="edit_sky_preset"/>
-				<menu_item_call label="Supprimer un préréglage..." name="delete_sky_preset"/>
 			</menu>
 			<menu label="Préréglages du jour" name="Day Presets">
 				<menu_item_call label="Nouveau préréglage..." name="new_day_preset"/>
 				<menu_item_call label="Modifier un préréglage..." name="edit_day_preset"/>
-				<menu_item_call label="Supprimer un préréglage..." name="delete_day_preset"/>
 			</menu>
 		</menu>
 	</menu>
diff --git a/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml
deleted file mode 100644
index 71071825af..0000000000
--- a/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<floater name="Delete Env Preset" title="CANCELLA PREDEFINITO AMB">
-	<string name="title_water">
-		Cancella valore predefinito acqua
-	</string>
-	<string name="title_sky">
-		Cancella valore predefinito cielo
-	</string>
-	<string name="title_day_cycle">
-		Cancella ciclo giornata
-	</string>
-	<string name="label_water">
-		Valori predefiniti:
-	</string>
-	<string name="label_sky">
-		Valori predefiniti:
-	</string>
-	<string name="label_day_cycle">
-		Ciclo giornata:
-	</string>
-	<string name="msg_confirm_deletion">
-		Sei sicuro di volere eliminare il valore predefinito selezionato?
-	</string>
-	<string name="msg_sky_is_referenced">
-		Impossibile rimuovere un valore predefinito che viene utilizzato in uno o più cicli di giornata.
-	</string>
-	<string name="combo_label">
-		-Seleziona un valore predefinito-
-	</string>
-	<text name="label">
-		Valori predefiniti:
-	</text>
-	<button label="Elimina" name="delete"/>
-	<button label="Annulla" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 607171d9be..f66b0dd501 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -89,17 +89,14 @@
 			<menu label="Valori predefiniti acqua" name="Water Presets">
 				<menu_item_call label="Nuovo valore predefinito..." name="new_water_preset"/>
 				<menu_item_call label="Modifica valore predefinito..." name="edit_water_preset"/>
-				<menu_item_call label="Cancella valore predefinito..." name="delete_water_preset"/>
 			</menu>
 			<menu label="Valori predefiniti cielo" name="Sky Presets">
 				<menu_item_call label="Nuovo valore predefinito..." name="new_sky_preset"/>
 				<menu_item_call label="Modifica valore predefinito..." name="edit_sky_preset"/>
-				<menu_item_call label="Cancella valore predefinito..." name="delete_sky_preset"/>
 			</menu>
 			<menu label="Valori predefiniti giorno" name="Day Presets">
 				<menu_item_call label="Nuovo valore predefinito..." name="new_day_preset"/>
 				<menu_item_call label="Modifica valore predefinito..." name="edit_day_preset"/>
-				<menu_item_call label="Cancella valore predefinito..." name="delete_day_preset"/>
 			</menu>
 		</menu>
 	</menu>
diff --git a/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml
deleted file mode 100644
index eb39d1b336..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<floater name="Delete Env Preset" title="環境の事前設定を削除">
-	<string name="title_water">
-		水の事前設定を削除
-	</string>
-	<string name="title_sky">
-		空の事前設定を削除
-	</string>
-	<string name="title_day_cycle">
-		デイサイクルを削除
-	</string>
-	<string name="label_water">
-		事前設定：
-	</string>
-	<string name="label_sky">
-		事前設定：
-	</string>
-	<string name="label_day_cycle">
-		デイサイクル：
-	</string>
-	<string name="msg_confirm_deletion">
-		選択された事前設定を削除しますか？
-	</string>
-	<string name="msg_sky_is_referenced">
-		デイサイクルの参照先として使われている事前設定は削除できません。
-	</string>
-	<string name="combo_label">
-		- 事前設定を選択 -
-	</string>
-	<text name="label">
-		事前設定：
-	</text>
-	<button label="削除" name="delete"/>
-	<button label="取り消し" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 9154f327c1..fc4fd9121d 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -89,17 +89,14 @@
 			<menu label="水の事前設定" name="Water Presets">
 				<menu_item_call label="新しい事前設定..." name="new_water_preset"/>
 				<menu_item_call label="事前設定を編集..." name="edit_water_preset"/>
-				<menu_item_call label="事前設定を削除..." name="delete_water_preset"/>
 			</menu>
 			<menu label="空の事前設定" name="Sky Presets">
 				<menu_item_call label="新しい事前設定..." name="new_sky_preset"/>
 				<menu_item_call label="事前設定を編集..." name="edit_sky_preset"/>
-				<menu_item_call label="事前設定を削除..." name="delete_sky_preset"/>
 			</menu>
 			<menu label="デイの事前設定" name="Day Presets">
 				<menu_item_call label="新しい事前設定..." name="new_day_preset"/>
 				<menu_item_call label="事前設定を編集..." name="edit_day_preset"/>
-				<menu_item_call label="事前設定を削除..." name="delete_day_preset"/>
 			</menu>
 		</menu>
 	</menu>
diff --git a/indra/newview/skins/default/xui/pl/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/pl/floater_delete_env_preset.xml
deleted file mode 100644
index fc750715c6..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_delete_env_preset.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<floater name="Delete Env Preset" title="USUŃ UST. OTOCZENIA">
-	<string name="title_water">
-		Usuń Ustawienie wody
-	</string>
-	<string name="title_sky">
-		Usuń Ustawienie nieba
-	</string>
-	<string name="title_day_cycle">
-		Usuń cykl dnia
-	</string>
-	<string name="label_water">
-		Wybierz:
-	</string>
-	<string name="label_sky">
-		Wybierz:
-	</string>
-	<string name="label_day_cycle">
-		Cykl dnia:
-	</string>
-	<string name="msg_confirm_deletion">
-		Masz absolutną pewność, że chcesz usunąć wybrane Ustawienie?
-	</string>
-	<string name="msg_sky_is_referenced">
-		Nie można usunąć Ustawienia odwołującego się do jakiegoś cyklu dnia.
-	</string>
-	<string name="combo_label">
-		-Wybierz Ustawienie-
-	</string>
-	<text name="label">
-		Wybierz:
-	</text>
-	<button label="Usuń" name="delete" />
-	<button label="Anuluj" name="cancel" />
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index e6ad1faee6..5190723660 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -84,17 +84,14 @@
 			<menu name="Water Presets" label="Ustawienia wody">
 				<menu_item_call label="Nowe Ustawienie..." name="new_water_preset" />
 				<menu_item_call label="Edytuj Ustawienie..." name="edit_water_preset" />
-				<menu_item_call label="Usuń Ustawienie..." name="delete_water_preset" />
 			</menu>
 			<menu name="Sky Presets" label="Ustawienia nieba">
 				<menu_item_call label="Nowe Ustawienie..." name="new_sky_preset" />
 				<menu_item_call label="Edytuj Ustawienie..." name="edit_sky_preset" />
-				<menu_item_call label="Usuń Ustawienie..." name="delete_sky_preset" />
 			</menu>
 			<menu name="Day Presets" label="Ustawienia pory dnia">
 				<menu_item_call label="Nowe Ustawienie..." name="new_day_preset" />
 				<menu_item_call label="Edytuj Ustawienie..." name="edit_day_preset" />
-				<menu_item_call label="Usuń Ustawienie..." name="delete_day_preset" />
 			</menu>
 		</menu>
 	</menu>
diff --git a/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml
deleted file mode 100644
index a8b5d8f67d..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<floater name="Delete Env Preset" title="EXCLUIR CONF AMBIENTE">
-	<string name="title_water">
-		Excluir pré-configuração da água
-	</string>
-	<string name="title_sky">
-		Excluir pré-configuração de céu
-	</string>
-	<string name="title_day_cycle">
-		Excluir pré-configuração dos dias
-	</string>
-	<string name="label_water">
-		Pré-configuração:
-	</string>
-	<string name="label_sky">
-		Pré-configuração:
-	</string>
-	<string name="label_day_cycle">
-		Ciclo dia:
-	</string>
-	<string name="msg_confirm_deletion">
-		Tem certeza de que quer excluir esta pré-configuração?
-	</string>
-	<string name="msg_sky_is_referenced">
-		Impossível excluir pré-configuração utilizada por um ou mais ciclos de dia .
-	</string>
-	<string name="combo_label">
-		-Selecione uma pré-configuração-
-	</string>
-	<text name="label">
-		Pré-configuração:
-	</text>
-	<button label="Excluir" name="delete"/>
-	<button label="Cancelar" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index cef0f02070..7ca6ad86ee 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -89,17 +89,14 @@
 			<menu label="Predefinições da água" name="Water Presets">
 				<menu_item_call label="Nova predefinição..." name="new_water_preset"/>
 				<menu_item_call label="Editar predefinição..." name="edit_water_preset"/>
-				<menu_item_call label="Excluir predefinição..." name="delete_water_preset"/>
 			</menu>
 			<menu label="Predefinições de céu" name="Sky Presets">
 				<menu_item_call label="Nova predefinição..." name="new_sky_preset"/>
 				<menu_item_call label="Editar predefinição..." name="edit_sky_preset"/>
-				<menu_item_call label="Excluir predefinição..." name="delete_sky_preset"/>
 			</menu>
 			<menu label="Predefinições do dia" name="Day Presets">
 				<menu_item_call label="Nova predefinição..." name="new_day_preset"/>
 				<menu_item_call label="Editar predefinição..." name="edit_day_preset"/>
-				<menu_item_call label="Excluir predefinição..." name="delete_day_preset"/>
 			</menu>
 		</menu>
 	</menu>
diff --git a/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml
deleted file mode 100644
index 3303a4f4c1..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<floater name="Delete Env Preset" title="УДАЛЕНИЕ НАСТРОЙКИ СРЕДЫ">
-	<string name="title_water">
-		Удалить настройку воды
-	</string>
-	<string name="title_sky">
-		Удалить настройку неба
-	</string>
-	<string name="title_day_cycle">
-		Удалить суточный цикл
-	</string>
-	<string name="label_water">
-		Настройка:
-	</string>
-	<string name="label_sky">
-		Настройка:
-	</string>
-	<string name="label_day_cycle">
-		Суточный цикл:
-	</string>
-	<string name="msg_confirm_deletion">
-		Действительно удалить выбранную настройку?
-	</string>
-	<string name="msg_sky_is_referenced">
-		Нельзя удалить настройку, которая используется в суточных циклах.
-	</string>
-	<string name="combo_label">
-		-Выбор настройки-
-	</string>
-	<text name="label">
-		Настройка:
-	</text>
-	<button label="Удалить" name="delete"/>
-	<button label="Отмена" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 309253213c..ec7925f858 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -87,17 +87,14 @@
 			<menu label="Настройки воды" name="Water Presets">
 				<menu_item_call label="Создать настройку..." name="new_water_preset"/>
 				<menu_item_call label="Изменить настройку..." name="edit_water_preset"/>
-				<menu_item_call label="Удалить настройку..." name="delete_water_preset"/>
 			</menu>
 			<menu label="Настройки неба" name="Sky Presets">
 				<menu_item_call label="Создать настройку..." name="new_sky_preset"/>
 				<menu_item_call label="Изменить настройку..." name="edit_sky_preset"/>
-				<menu_item_call label="Удалить настройку..." name="delete_sky_preset"/>
 			</menu>
 			<menu label="Суточные настройки" name="Day Presets">
 				<menu_item_call label="Создать настройку..." name="new_day_preset"/>
 				<menu_item_call label="Изменить настройку..." name="edit_day_preset"/>
-				<menu_item_call label="Удалить настройку..." name="delete_day_preset"/>
 			</menu>
 		</menu>
 	</menu>
diff --git a/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml
deleted file mode 100644
index 915770f727..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<floater name="Delete Env Preset" title="ORTAM ÖN AYARINI SİL">
-	<string name="title_water">
-		Su Ön Ayarını Sil
-	</string>
-	<string name="title_sky">
-		Gökyüzü Ön Ayarını Sil
-	</string>
-	<string name="title_day_cycle">
-		Gün Döngüsünü Sil
-	</string>
-	<string name="label_water">
-		Ön Ayar:
-	</string>
-	<string name="label_sky">
-		Ön Ayar:
-	</string>
-	<string name="label_day_cycle">
-		Gün döngüsü:
-	</string>
-	<string name="msg_confirm_deletion">
-		Seçili ön ayarı silmek istediğinize emin misiniz?
-	</string>
-	<string name="msg_sky_is_referenced">
-		Bazı gün döngüleri tarafından başvurulan bir ön ayar kaldırılamaz.
-	</string>
-	<string name="combo_label">
-		-Bir ön ayar seçin-
-	</string>
-	<text name="label">
-		Ön Ayar:
-	</text>
-	<button label="Sil" name="delete"/>
-	<button label="İptal" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index ad134c717e..7b041c943c 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -87,17 +87,14 @@
 			<menu label="Su Ön Ayarları" name="Water Presets">
 				<menu_item_call label="Yeni ön ayar..." name="new_water_preset"/>
 				<menu_item_call label="Ön ayarı düzenle..." name="edit_water_preset"/>
-				<menu_item_call label="Ön ayarı sil..." name="delete_water_preset"/>
 			</menu>
 			<menu label="Gökyüzü Ön Ayarları" name="Sky Presets">
 				<menu_item_call label="Yeni ön ayar..." name="new_sky_preset"/>
 				<menu_item_call label="Ön ayarı düzenle..." name="edit_sky_preset"/>
-				<menu_item_call label="Ön ayarı sil..." name="delete_sky_preset"/>
 			</menu>
 			<menu label="Gün Ön Ayarları" name="Day Presets">
 				<menu_item_call label="Yeni ön ayar..." name="new_day_preset"/>
 				<menu_item_call label="Ön ayarı düzenle..." name="edit_day_preset"/>
-				<menu_item_call label="Ön ayarı sil..." name="delete_day_preset"/>
 			</menu>
 		</menu>
 	</menu>
diff --git a/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml
deleted file mode 100644
index 4aafb31952..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<floater name="Delete Env Preset" title="刪除環境自訂配置">
-	<string name="title_water">
-		刪除水的自訂配置
-	</string>
-	<string name="title_sky">
-		刪除天空自訂配置
-	</string>
-	<string name="title_day_cycle">
-		刪除日循環
-	</string>
-	<string name="label_water">
-		自訂配置：
-	</string>
-	<string name="label_sky">
-		自訂配置：
-	</string>
-	<string name="label_day_cycle">
-		日循環：
-	</string>
-	<string name="msg_confirm_deletion">
-		確定要刪除所選自訂配置？
-	</string>
-	<string name="msg_sky_is_referenced">
-		無法刪除日循環有所指涉的自訂配置。
-	</string>
-	<string name="combo_label">
-		-選擇一個自訂配置-
-	</string>
-	<text name="label">
-		自訂配置：
-	</text>
-	<button label="刪除" name="delete"/>
-	<button label="取消" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 433e34758a..4c53d2be19 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -87,17 +87,14 @@
 			<menu label="水的自訂配置" name="Water Presets">
 				<menu_item_call label="新的自訂配置…" name="new_water_preset"/>
 				<menu_item_call label="編輯自訂配置…" name="edit_water_preset"/>
-				<menu_item_call label="刪除自訂配置…" name="delete_water_preset"/>
 			</menu>
 			<menu label="天空自訂配置" name="Sky Presets">
 				<menu_item_call label="新的自訂配置…" name="new_sky_preset"/>
 				<menu_item_call label="編輯自訂配置…" name="edit_sky_preset"/>
-				<menu_item_call label="刪除自訂配置…" name="delete_sky_preset"/>
 			</menu>
 			<menu label="日的自訂配置" name="Day Presets">
 				<menu_item_call label="新的自訂配置…" name="new_day_preset"/>
 				<menu_item_call label="編輯自訂配置…" name="edit_day_preset"/>
-				<menu_item_call label="刪除自訂配置…" name="delete_day_preset"/>
 			</menu>
 		</menu>
 	</menu>
-- 
cgit v1.2.3