From 3e299ab7642871b9d687940b1968de98f461892d Mon Sep 17 00:00:00 2001
From: Boroondas Gupte <hg@boroon.dasgupta.ch>
Date: Thu, 2 Sep 2010 18:29:42 +0200
Subject: =?UTF-8?q?VWR-20583=20FIXED=20submenu=20indicators=20(=E2=96=B6?=
 =?UTF-8?q?=20a.k.a.=20U+25B6)=20shouldn't=20be=20hard-coded=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20in=20context=20menu=20su?=
 =?UTF-8?q?b=20menu=20names?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use the same mechanism for adding the triangle in LLContextMenuBranch as
is already used in LLMenuItemBranchGL. As a bonus, the triangles will be
nicely right-aligned, just as in the main menu.

Remaining hard-coded triangles all are in indra/newview/skins/default/xui/*/panel_voice_effect.xml.
---
 indra/newview/skins/default/xui/fr/menu_avatar_self.xml        | 8 ++++----
 indra/newview/skins/default/xui/fr/menu_object.xml             | 8 ++++----
 indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins/default/xui/fr')

diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
index 3620dc72b0..bcf2757b58 100644
--- a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Self Pie">
 	<menu_item_call label="Me lever" name="Stand Up"/>
-	<context_menu label="Enlever  ▶" name="Take Off &gt;">
-		<context_menu label="Habits  ▶" name="Clothes &gt;">
+	<context_menu label="Enlever" name="Take Off &gt;">
+		<context_menu label="Habits" name="Clothes &gt;">
 			<menu_item_call label="Chemise" name="Shirt"/>
 			<menu_item_call label="Pantalon" name="Pants"/>
 			<menu_item_call label="Jupe" name="Skirt"/>
@@ -16,8 +16,8 @@
 			<menu_item_call label="Alpha" name="Self Alpha"/>
 			<menu_item_call label="Tous les habits" name="All Clothes"/>
 		</context_menu>
-		<context_menu label="HUD  ▶" name="Object Detach HUD"/>
-		<context_menu label="Détacher  ▶" name="Object Detach"/>
+		<context_menu label="HUD" name="Object Detach HUD"/>
+		<context_menu label="Détacher" name="Object Detach"/>
 		<menu_item_call label="Tout détacher" name="Detach All"/>
 	</context_menu>
 	<menu_item_call label="Changer de tenue" name="Chenge Outfit"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml
index 6492a83e06..c60beb9b51 100644
--- a/indra/newview/skins/default/xui/fr/menu_object.xml
+++ b/indra/newview/skins/default/xui/fr/menu_object.xml
@@ -8,12 +8,12 @@
 	<menu_item_call label="Me lever" name="Object Stand Up"/>
 	<menu_item_call label="Profil de l&apos;objet" name="Object Inspect"/>
 	<menu_item_call label="Zoomer en avant" name="Zoom In"/>
-	<context_menu label="Porter  ▶" name="Put On">
+	<context_menu label="Porter" name="Put On">
 		<menu_item_call label="Porter" name="Wear"/>
-		<context_menu label="Attacher  ▶" name="Object Attach"/>
-		<context_menu label="Attacher les éléments HUD  ▶" name="Object Attach HUD"/>
+		<context_menu label="Attacher" name="Object Attach"/>
+		<context_menu label="Attacher les éléments HUD" name="Object Attach HUD"/>
 	</context_menu>
-	<context_menu label="Supprimer  ▶" name="Remove">
+	<context_menu label="Supprimer" name="Remove">
 		<menu_item_call label="Signaler une infraction" name="Report Abuse..."/>
 		<menu_item_call label="Ignorer" name="Object Mute"/>
 		<menu_item_call label="Retour" name="Return..."/>
diff --git a/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml
index 39e8ca2173..383ff6ad6b 100644
--- a/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml
@@ -4,8 +4,8 @@
 	<menu_item_call label="Ajouter" name="wear_add"/>
 	<menu_item_call label="Enlever / Détacher" name="take_off_or_detach"/>
 	<menu_item_call label="Détacher" name="detach"/>
-	<context_menu label="Attacher à  ▶" name="wearable_attach_to"/>
-	<context_menu label="Attacher au HUD  ▶" name="wearable_attach_to_hud"/>
+	<context_menu label="Attacher à" name="wearable_attach_to"/>
+	<context_menu label="Attacher au HUD" name="wearable_attach_to_hud"/>
 	<menu_item_call label="Enlever" name="take_off"/>
 	<menu_item_call label="Modifier" name="edit"/>
 	<menu_item_call label="Profil de l&apos;objet" name="object_profile"/>
-- 
cgit v1.2.3