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

I kind of messed up the if block so it would never get to muted avs or friends in the radar floater, fix that

Browse Source
This commit is contained in:
Hazim Gazov
2010-08-16 00:32:33 +00:00
parent c31782846c
commit 0561030740
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llfloateravatarlist.cpp
View File

@@ -695,21 +695,21 @@ void LLFloaterAvatarList::refreshAvatarList()
//<edit> custom colors for certain types of avatars!
element["columns"][LIST_AVATAR_NAME]["color"] = gColors.getColor( "RadarAvatar" ).getValue();
LLViewerRegion* parent_estate = LLWorld::getInstance()->getRegionFromPosGlobal(entry->getPosition());
LLUUID estate_owner = LLUUID::null;
if(parent_estate && parent_estate->isAlive())
{
estate_owner = parent_estate->getOwner();
}
//Lindens are always more Linden than your friend, make that take precedence
if(LLMuteList::getInstance()->isLinden(entry->getName()))
{
element["columns"][LIST_AVATAR_NAME]["color"] = gColors.getColor( "RadarLinden" ).getValue();
}
//first make sure their parent estate actually still exists and is alive
else if(parent_estate && parent_estate->isAlive())
//first make sure their parent estate actually still exists and is alive, and yes, I am lazy.
else if(estate_owner.notNull() && av_id == estate_owner)
{
LLUUID estate_owner = parent_estate->getOwner();
//check if they are an estate owner at their current position
if(estate_owner.notNull() && av_id == estate_owner)
{
element["columns"][LIST_AVATAR_NAME]["color"] = gColors.getColor( "RadarEstateOwner" ).getValue();
}
}
//without these people, SL would suck.
else if(is_agent_friend(av_id))

2
indra/newview/skins/default/colors_base.xml
View File

@@ -148,7 +148,7 @@
<RadarFriend value="0, 255, 0, 255" />
<RadarLinden value="0, 0, 255, 255" />
<RadarEstateOwner value="204, 102, 10, 255" />
<RadarMuted value="120, 120, 120, 255" />
<RadarMuted value="255, 255, 255, 150" />
<!-- MINI-MAP -->
<NetMapBackgroundColor value="0, 0, 0, 77" />