diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index b2813e728f4057b986842b2e056c74968c0e6cf6..3cd1673f61503e6819d9ec2688865593ad961cb6 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -82,9 +82,6 @@ static LLDefaultChildRegistry::Register<LLChatHistory> r("chat_history");
 
 const static std::string NEW_LINE(rawstr_to_utf8("\n"));
 
-const static std::string SLURL_APP_AGENT = "secondlife:///app/agent/";
-const static std::string SLURL_ABOUT = "/about";
-
 // support for secondlife:///app/objectim/{UUID}/ SLapps
 class LLObjectIMHandler : public LLCommandHandler
 {
@@ -1580,7 +1577,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 		//*HACK getting rid of redundant sender names in system notifications sent using sender name (see EXT-5010)
 		if (use_plain_text_chat_history && !from_me && chat.mFromID.notNull())
 		{
-			std::string slurl_about = SLURL_APP_AGENT + chat.mFromID.asString() + SLURL_ABOUT;
+			std::string slurl_about = LLSLURL("agent", chat.mFromID, "about").getSLURLString();
 			if (message.length() > slurl_about.length() && 
 				message.compare(0, slurl_about.length(), slurl_about) == 0)
 			{
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index ecea26ced3e65db4140953d716af3d1f994f7ece..8adb0de50b08550bd273a6a443b5617fa6bdddc0 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3223,7 +3223,6 @@ bool enable_object_mute()
 	if (avatar)
 	{
 		// It's an avatar
-		LLNameValue *lastname = avatar->getNVPair("LastName");
 		bool is_linden = LLMuteList::isLinden(avatar->getFullname());
 		bool is_self = avatar->isSelf();
 //		return !is_linden && !is_self;
@@ -3249,7 +3248,6 @@ bool enable_object_unmute()
 	if (avatar)
 	{
 		// It's an avatar
-		LLNameValue *lastname = avatar->getNVPair("LastName");
 		bool is_linden = LLMuteList::isLinden(avatar->getFullname());
 		bool is_self = avatar->isSelf();
 		return !is_linden && !is_self;