Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Was looking up ascent colors in incorrect control group.

Browse Source
This commit is contained in:
Shyotl
2012-02-03 14:11:10 -06:00
parent 9ee0c5acf3
commit 726dc02aaa
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llvoavatar.cpp
View File

@@ -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<LLColor4> ascent_linden_color(gColors, "AscentLindenColor" );
static const LLCachedControl<LLColor4> 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<LLColor4> ascent_estate_owner_color(gColors, "AscentEstateOwnerColor" );
static const LLCachedControl<LLColor4> 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<LLColor4> ascent_friend_color(gColors, "AscentFriendColor" );
static const LLCachedControl<LLColor4> 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<LLColor4> ascent_muted_color(gColors, "AscentMutedColor" );
static const LLCachedControl<LLColor4> ascent_muted_color( "AscentMutedColor" );
mClientColor = ascent_muted_color;
}
}