diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 17:34:39 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 17:34:39 -0800 |
commit | 5352954eb65076d877cc74d4328620e910b93d1c (patch) | |
tree | a8bf1c956c0de44a5ab7eb0a2a05d5e9ed29b751 /indra/newview/llavataractions.cpp | |
parent | 13d4257868451d1e3a5797bd02a0e6f749cc0836 (diff) | |
parent | b1891e2982cc03ccd695eae82989d3e58695616c (diff) |
automated merge
Diffstat (limited to 'indra/newview/llavataractions.cpp')
-rw-r--r-- | indra/newview/llavataractions.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 39d1efa49a..2bef58a4e9 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -612,3 +612,13 @@ bool LLAvatarActions::isBlocked(const LLUUID& id) gCacheName->getFullName(id, name); return LLMuteList::getInstance()->isMuted(id, name); } + +// static +bool LLAvatarActions::canBlock(const LLUUID& id) +{ + std::string firstname, lastname; + gCacheName->getName(id, firstname, lastname); + bool is_linden = !LLStringUtil::compareStrings(lastname, "Linden"); + bool is_self = id == gAgentID; + return !is_self && !is_linden; +} |