From cdae00e7f0afd463ad84bea07bdb1e6bd2d27814 Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Tue, 19 Jan 2010 16:01:49 -0800
Subject: better fix of EXT-299 "Mute" still showing in avatar Context menu,
 although label says "Block" The original fix at r6543 created a duplicate
 node, which breaks localization. Renaming that new node with a unique name=.

---
 indra/newview/lltoolpie.cpp                    | 2 +-
 indra/newview/skins/default/xui/en/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index da7e8cd767..da68af1597 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1515,7 +1515,7 @@ BOOL LLToolPie::pickRightMouseDownCallback()
 			}
 			else
 			{
-				mute_msg = LLTrans::getString("MuteObject");
+				mute_msg = LLTrans::getString("MuteObject2");
 			}
 			
 			gMenuHolder->childSetText("Object Mute", mute_msg);
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 02dc507781..b378944e48 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2170,7 +2170,7 @@ this texture in your inventory
 		Unknown file extension .%s
 Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	</string>
-  <string name="MuteObject">Block</string>
+  <string name="MuteObject2">Block</string>
   <string name="MuteAvatar">Block</string>
   <string name="UnmuteObject">Unblock</string>
   <string name="UnmuteAvatar">Unblock</string>
-- 
cgit v1.2.3