diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp index 92a80a517..81d21ae70 100644 --- a/indra/newview/llfloateravatarlist.cpp +++ b/indra/newview/llfloateravatarlist.cpp @@ -885,7 +885,7 @@ void LLFloaterAvatarList::refreshAvatarList() LLColor4 name_color = sDefaultListText; //Lindens are always more Linden than your friend, make that take precedence - if(LLMuteList::getInstance()->isLinden(av_name)) + if(LLMuteList::getInstance()->isLinden(av_id)) { static const LLCachedControl ascent_linden_color("AscentLindenColor",LLColor4(0.f,0.f,1.f,1.f)); name_color = ascent_linden_color; diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp index 3ce3eb188..38bd8865d 100644 --- a/indra/newview/llmutelist.cpp +++ b/indra/newview/llmutelist.cpp @@ -280,6 +280,13 @@ LLMuteList::~LLMuteList() } } +bool LLMuteList::isLinden(const LLUUID& id) const +{ + std::string name; + gCacheName->getFullName(id, name); + return isLinden(name); +} + BOOL LLMuteList::isLinden(const std::string& name) const { typedef boost::tokenizer > tokenizer; diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h index 11a20e015..e2471022e 100644 --- a/indra/newview/llmutelist.h +++ b/indra/newview/llmutelist.h @@ -116,6 +116,7 @@ public: BOOL isMuted(const LLUUID& id, U32 flags) const { return isMuted(id, LLStringUtil::null, flags); }; BOOL isLinden(const std::string& name) const; + bool isLinden(const LLUUID& id) const; BOOL isLoaded() const { return mIsLoaded; } diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index 724b15c94..044f5b77e 100644 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -409,7 +409,7 @@ void LLNetMap::draw() avColor = it->second; } //Lindens are always more Linden than your friend, make that take precedence - else if(LLMuteList::getInstance()->isLinden(avName)) + else if(LLMuteList::getInstance()->isLinden(id)) { avColor = linden_color; }