From 726dc02aaa7e9e648b117fbdb9de6e7b5daf50a7 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Fri, 3 Feb 2012 14:11:10 -0600 Subject: [PATCH] Was looking up ascent colors in incorrect control group. --- indra/newview/llvoavatar.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 100d9445a..bff31c7f0 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3612,25 +3612,25 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last) //Lindens are always more Linden than your friend, make that take precedence if(LLMuteList::getInstance()->isLinden(getFullname())) { - static const LLCachedControl ascent_linden_color(gColors, "AscentLindenColor" ); + static const LLCachedControl ascent_linden_color( "AscentLindenColor" ); mClientColor = ascent_linden_color; } //check if they are an estate owner at their current position else if(estate_owner.notNull() && this->getID() == estate_owner) { - static const LLCachedControl ascent_estate_owner_color(gColors, "AscentEstateOwnerColor" ); + static const LLCachedControl ascent_estate_owner_color( "AscentEstateOwnerColor" ); mClientColor = ascent_estate_owner_color; } //without these dots, SL would suck. else if (LLAvatarTracker::instance().getBuddyInfo(this->getID()) != NULL) { - static const LLCachedControl ascent_friend_color(gColors, "AscentFriendColor" ); + static const LLCachedControl ascent_friend_color( "AscentFriendColor" ); mClientColor = ascent_friend_color; } //big fat jerkface who is probably a jerk, display them as such. else if(LLMuteList::getInstance()->isMuted(this->getID())) { - static const LLCachedControl ascent_muted_color(gColors, "AscentMutedColor" ); + static const LLCachedControl ascent_muted_color( "AscentMutedColor" ); mClientColor = ascent_muted_color; } }