From 90c5219be97c213d125e1bb08354b2dae51d5911 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Fri, 8 Aug 2014 08:43:24 -0400
Subject: [PATCH] Move Media Filter from the View menu to the Singularity menu.

Moves Media Filter in all translations, no need for translators to worry~
Nomade, please translate the Singularity menu at your discretion.. in menu_viewer.xml
---
 indra/newview/skins/default/xui/de/menu_viewer.xml    | 4 ++--
 indra/newview/skins/default/xui/en-us/menu_viewer.xml | 9 ++++-----
 indra/newview/skins/default/xui/es/menu_viewer.xml    | 6 +++---
 indra/newview/skins/default/xui/fr/menu_viewer.xml    | 4 +++-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 4841e56e3..ff86604f5 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -95,7 +95,6 @@
 		<menu_item_check label="Aktive Sprecher" name="Active Speakers"/>
 		<menu_item_check label="Stummschalten-Liste" name="Mute List"/>
 		<menu_item_check label="Teleport-Liste" name="Teleport History"/>
-		<menu_item_check label="Medienfilter" name="Media Filter"/>
 		<menu_item_separator label="-----------" name="separator2"/>
 		<menu_item_check label="Kamerasteuerung" name="Camera Controls"/>
 		<menu_item_check label="Bewegungssteuerung" name="Movement Controls"/>
@@ -259,7 +258,7 @@
 		</menu>
 		<menu_item_call label="Über [APP_NAME]..." name="About Second Life..."/>
 	</menu>
-	<menu label="[SHORT_APP_NAME]" name="Singularity">
+	<menu name="Singularity">
 		<menu_item_call label="Alle Dialoge schließen" name="Close All Dialogs"/>
 		
 		<menu_item_call label="Täusche Abwesend-Status vor" name="Fake Away Status"/>
@@ -271,6 +270,7 @@
 		<menu_item_check label="Areal-Objektsuche" name="Object Area Search"/>
 		<menu_item_check label="Sound Explorer" name="Sound Explorer"/>
 		<menu_item_check label="Asset-Blacklist" name="Asset Blacklist"/>
+		<menu_item_check label="Medienfilter" name="Media Filter"/>
 		<menu_item_check label="Streaming-Audio Anzeige" name="Streaming Audio Display"/>
 		<menu_item_check label="Pose-Stand" name="Pose Stand"/>
 		<menu_item_check label="Region Debug Konsole" name="Region Debug Console"/>
diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 458bb96c8..a9115f61c 100644
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -357,11 +357,6 @@
 			<on_click function="ShowFloater" userdata="teleport history" />
 			<on_check function="FloaterVisible" userdata="teleport history" />
 		</menu_item_check>
-		<menu_item_check bottom="-192" enabled="true" height="19" label="Media Filter" left="0"
-		     mouse_opaque="true" name="Media Filter" width="211">
-			<on_click function="ShowFloater" userdata="media filter" />
-			<on_check function="FloaterVisible" userdata="media filter" />
-		</menu_item_check>
 		<menu_item_separator bottom="-197" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator2" width="211" />
 		<menu_item_check bottom="-216" enabled="true" height="19" label="Camera Controls" left="0"
@@ -1040,6 +1035,10 @@
 			<on_click function="ShowFloater" userdata="asset_blacklist"/>
 			<on_check function="FloaterVisible" userdata="asset_blacklist"/>
 		</menu_item_check>
+		<menu_item_check label="Media Filter" name="Media Filter">
+			<on_click function="ShowFloater" userdata="media filter" />
+			<on_check function="FloaterVisible" userdata="media filter" />
+		</menu_item_check>
 		<menu_item_check label="Streaming Audio Display" mouse_opaque="true" name="Streaming Audio Display">
 			<on_click function="ShowFloater" userdata="media ticker"/>
 			<on_check function="FloaterVisible" userdata="media ticker"/>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 24589cfe9..d4b53e57b 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -75,7 +75,6 @@
 		<menu_item_check label="Participantes Activos" name="Active Speakers"/>
 		<menu_item_check label="Lista de Ignorados" name="Mute List"/>
 		<menu_item_check label="Historial de Teleporte" name="Teleport History"/>
-		<menu_item_check label="Filtro de Media" name="Media Filter"/>
 		<menu_item_check label="Controles de Cámara" name="Camera Controls"/>
 		<menu_item_check label="Controles de Movimiento" name="Movement Controls"/>
 		<menu_item_check label="Mapa del Mundo" name="World Map"/>
@@ -215,7 +214,7 @@
 		<menu_item_call label="Acerca de [APP_NAME]..." name="About Second Life..."/>
 	</menu>
 	<!-- ============================= -->
-	<menu label="[SHORT_APP_NAME]" name="Singularity">
+	<menu name="Singularity">
 		<menu_item_call label="Cerrar todos los diálogos" name="Close All Dialogs"/>
 		<menu_item_call label="Falso Estado Ausente" name="Fake Away Status"/>
 		<menu_item_call label="Forzar Sentarse en el Piso" name="Force Ground Sit"/>
@@ -224,9 +223,10 @@
 		<menu_item_check label="Búsqueda en Área" name="Object Area Search"/>
 		<menu_item_check label="Explorador de Sonidos" name="Sound Explorer"/>
 		<menu_item_check label="Lista Negra de Assets" name="Asset Blacklist"/>
+		<menu_item_check label="Filtro de Media" name="Media Filter"/>
 		<menu_item_check label="Mostrar Información de Audio" name="Streaming Audio Display"/>
 		<menu_item_check label="Pose Stand" name="Pose Stand"/>
 		<menu_item_check label="Consola de Depuración de Región" name="Region Debug Console"/>
 		<menu_item_call label="Redibujar" name="Rebake"/>
-	</menu>		
+	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index dce04a84e..91b4c1b34 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -83,7 +83,6 @@
 		<menu_item_check label="Intervenants actifs" name="Active Speakers"/>
 		<menu_item_check label="Liste des ignorés - Mute" name="Mute List"/>
 		<menu_item_check label="Historique des TP" name="Teleport History"/>
-		<menu_item_check label="Filtre Médias" name="Media Filter"/>
 		<menu_item_separator label="-----------" name="separator2"/>
 		<menu_item_check label="Contrôles de la caméra" name="Camera Controls"/>
 		<menu_item_check label="Contrôle des déplacements" name="Movement Controls"/>
@@ -243,4 +242,7 @@
 		</menu>
 		<menu_item_call label="A propos de [APP_NAME]" name="About Second Life..."/>
 	</menu>
+	<menu name="Singularity">
+		<menu_item_check label="Filtre Médias" name="Media Filter"/>
+	</menu>
 </menu_bar>