diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-08-23 09:19:59 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-08-23 09:19:59 -0400 |
| commit | bcf5dc079a5dc9434b541a971e28315fa5cb9816 (patch) | |
| tree | 16f6b186d704ca9682bcbfcb8aca1e29ef85b103 /indra/newview/llmutelist.cpp | |
| parent | fa53653e60f5761c157b76423b4449fe38788d8f (diff) | |
| parent | 08cbed55ef5689fcc5a02dfb3b9afde15487036e (diff) | |
merge changes for 5.0.7-release
Diffstat (limited to 'indra/newview/llmutelist.cpp')
| -rw-r--r-- | indra/newview/llmutelist.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp index 5b53a05274..bf1716e18c 100644 --- a/indra/newview/llmutelist.cpp +++ b/indra/newview/llmutelist.cpp @@ -48,6 +48,7 @@ #include <boost/tokenizer.hpp> #include <boost/bind.hpp> +#include <boost/algorithm/string/replace.hpp> #include "lldispatcher.h" #include "llxfermanager.h" @@ -180,9 +181,10 @@ LLMuteList::~LLMuteList() BOOL LLMuteList::isLinden(const std::string& name) const { + std::string username = boost::replace_all_copy(name, ".", " "); typedef boost::tokenizer<boost::char_separator<char> > tokenizer; boost::char_separator<char> sep(" "); - tokenizer tokens(name, sep); + tokenizer tokens(username, sep); tokenizer::iterator token_iter = tokens.begin(); if (token_iter == tokens.end()) return FALSE; @@ -190,7 +192,8 @@ BOOL LLMuteList::isLinden(const std::string& name) const if (token_iter == tokens.end()) return FALSE; std::string last_name = *token_iter; - return last_name == "Linden"; + LLStringUtil::toLower(last_name); + return last_name == "linden"; } static LLVOAvatar* find_avatar(const LLUUID& id) |