From 4cca7eb4259a7b0949fe9714e439b9e4ec2336ba Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 9 Dec 2009 18:26:34 -0800
Subject: EXT-299 "Mute" still showing in menu_pie_avatar.xml although label
 says "Block"

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

diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 8a69c362b2..df8d1df609 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1478,21 +1478,24 @@ BOOL LLToolPie::pickRightMouseDownCallback()
 			// Object is an avatar, so check for mute by id.
 			LLVOAvatar* avatar = (LLVOAvatar*)object;
 			std::string name = avatar->getFullname();
+			std::string mute_msg;
 			if (LLMuteList::getInstance()->isMuted(avatar->getID(), avatar->getFullname()))
 			{
-				gMenuHolder->childSetText("Avatar Mute", std::string("Unmute")); // *TODO:Translate
+				mute_msg = LLTrans::getString("UnmuteAvatar");
 			}
 			else
 			{
-				gMenuHolder->childSetText("Avatar Mute", std::string("Mute")); // *TODO:Translate
+				mute_msg = LLTrans::getString("MuteAvatar");
 			}
 
 			if (is_other_attachment)
 			{
+				gMenuAttachmentOther->getChild<LLUICtrl>("Avatar Mute")->setValue(mute_msg);
 				gMenuAttachmentOther->show(x, y);
 			}
 			else
 			{
+				gMenuAvatarOther->getChild<LLUICtrl>("Avatar Mute")->setValue(mute_msg);
 				gMenuAvatarOther->show(x, y);
 			}
 		}
@@ -1509,15 +1512,17 @@ BOOL LLToolPie::pickRightMouseDownCallback()
 			{
 				name = node->mName;
 			}
+			std::string mute_msg;
 			if (LLMuteList::getInstance()->isMuted(object->getID(), name))
 			{
-				gMenuHolder->childSetText("Object Mute", std::string("Unmute")); // *TODO:Translate
+				mute_msg = LLTrans::getString("UnmuteObject");
 			}
 			else
 			{
-				gMenuHolder->childSetText("Object Mute", std::string("Mute")); // *TODO:Translate
+				mute_msg = LLTrans::getString("MuteObject");
 			}
 			
+			gMenuHolder->childSetText("Object Mute", mute_msg);
 			gMenuObject->show(x, y);
 
 			showVisualContextMenuEffect();
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d5022de089..4d507a4a61 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2112,6 +2112,10 @@ 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="MuteAvatar">Block</string>
+  <string name="UnmuteObject">Unblock</string>
+  <string name="UnmuteAvatar">Unblock</string>
 	<string name="AddLandmarkNavBarMenu">Add to My Landmarks...</string>
 	<string name="EditLandmarkNavBarMenu">Edit my Landmark...</string>
 
-- 
cgit v1.2.3