Merge

1 files changed, 16 insertions, 0 deletions

diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp
index 65ac11092c..d79baf90e7 100755
--- a/indra/newview/llmutelist.cpp
+++ b/indra/newview/llmutelist.cpp
@@ -646,6 +646,22 @@ BOOL LLMuteList::isMuted(const LLUUID& id, const std::string& name, U32 flags) c
 	return legacy_it != mLegacyMutes.end();
 }
 
+BOOL LLMuteList::isMuted(const std::string& username, U32 flags) const
+{
+	mute_set_t::const_iterator mute_iter = mMutes.begin();
+	while(mute_iter != mMutes.end())
+	{
+		// can't convert "leha.test" into "LeHa TesT" so username comparison is more reliable
+		if (mute_iter->mType == LLMute::AGENT
+			&& LLCacheName::buildUsername(mute_iter->mName) == username)
+		{
+			return TRUE;
+		}
+		mute_iter++;
+	}
+	return FALSE;
+}
+
 //-----------------------------------------------------------------------------
 // requestFromServer()
 //-----------------------------------------------------------------------------