From d08bf75d14a853c6e48584957741a028ce5e9c79 Mon Sep 17 00:00:00 2001 From: Beeks Date: Wed, 6 Oct 2010 14:27:54 -0400 Subject: [PATCH] Hopefully this will allow Linden tag coloring. Signed-off-by: Beeks --- indra/newview/llvoavatar.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 5a8359ae7..1cdfa6a1a 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3744,16 +3744,12 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last) { estate_owner = parent_estate->getOwner(); } - /*this->getClientInfo - std::string name; - name += firstname->getString(); - name += " "; - name += lastname->getString(); + //Lindens are always more Linden than your friend, make that take precedence - if(LLMuteList::getInstance()->isLinden(name)) + if(LLMuteList::getInstance()->isLinden(getFullname())) { mClientColor = gCOASavedSettings->getColor4("AscentLindenColor").getValue(); - }*/ + } //check if they are an estate owner at their current position else if(estate_owner.notNull() && this->getID() == estate_owner) { @@ -9398,7 +9394,10 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys ) } if( param ) { - llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file for " << getFullname() << " (Prematurely reached end of list at " << param->getName() << ")." << llendl; + if (param->getName() == "tattoo_red") + llinfos << getFullname() << " does not have tattoo tinting." << llendl; + else + llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file for " << getFullname() << " (Prematurely reached end of list at " << param->getName() << ")." << llendl; //return; //ASC-TTRFE }