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

Add colors to the radar as well, there were some crashes for Estate owner detection, but they should be fixed (need to check on the minimap.)

Browse Source
This commit is contained in:
Hazim Gazov
2010-08-15 23:18:40 +00:00
parent 78f3cae804
commit c31782846c
3 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
indra/newview/llfloateravatarlist.cpp
View File

@@ -53,6 +53,10 @@
#include "llsdutil.h" #include "llsdutil.h"
//<edit>
#include "llviewermenu.h"
//</edit>
/** /**
* @brief How long to keep people who are gone in the list and in memory. * @brief How long to keep people who are gone in the list and in memory.
*/ */
@@ -687,10 +691,37 @@ void LLFloaterAvatarList::refreshAvatarList()
{ {
element["columns"][LIST_AVATAR_NAME]["font-style"] = "BOLD"; element["columns"][LIST_AVATAR_NAME]["font-style"] = "BOLD";
} }
if (LLMuteList::getInstance()->isMuted(av_id))
//<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());
//Lindens are always more Linden than your friend, make that take precedence
if(LLMuteList::getInstance()->isLinden(entry->getName()))
{ {
element["columns"][LIST_AVATAR_NAME]["color"] = LLColor4::red2.getValue(); 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())
{
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))
{
element["columns"][LIST_AVATAR_NAME]["color"] = gColors.getColor( "RadarFriend" ).getValue();
}
//big fat jerkface who is probably a jerk, display them as such.
else if(LLMuteList::getInstance()->isMuted(av_id))
{
element["columns"][LIST_AVATAR_NAME]["color"] = gColors.getColor( "RadarMuted" ).getValue();
}
//</edit>
char temp[32]; char temp[32];
LLColor4 color = LLColor4::black; LLColor4 color = LLColor4::black;

4
indra/newview/llnetmap.cpp
View File

@@ -351,13 +351,15 @@ void LLNetMap::draw()
gCacheName->getFullName(avatar_ids[i], avName); gCacheName->getFullName(avatar_ids[i], avName);
LLUUID estate_owner = LLWorld::getInstance()->getRegionFromPosGlobal(positions[i])->getOwner();
//Lindens are always more Linden than your friend, make that take precedence //Lindens are always more Linden than your friend, make that take precedence
if(LLMuteList::getInstance()->isLinden(avName)) if(LLMuteList::getInstance()->isLinden(avName))
{ {
avColor = gColors.getColor( "MapLinden" ); avColor = gColors.getColor( "MapLinden" );
} }
//check if they are an estate owner at their current position //check if they are an estate owner at their current position
else if(avatar_ids[i] == LLWorld::getInstance()->getRegionFromPosGlobal(positions[i])->getOwner()) else if(estate_owner.notNull() && avatar_ids[i] == estate_owner)
{ {
avColor = gColors.getColor( "MapEstateOwner" ); avColor = gColors.getColor( "MapEstateOwner" );
} }

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

@@ -142,6 +142,14 @@
<MapEstateOwner value="255, 165, 0, 255" /> <MapEstateOwner value="255, 165, 0, 255" />
<MapMuted value="180, 180, 180, 255" /> <MapMuted value="180, 180, 180, 255" />
<!-- RADAR -->
<RadarAvatar value="0, 0, 0, 255" />
<RadarFriend value="0, 255, 0, 255" />
<RadarLinden value="0, 0, 255, 255" />
<RadarEstateOwner value="204, 102, 10, 255" />
<RadarMuted value="120, 120, 120, 255" />
<!-- MINI-MAP --> <!-- MINI-MAP -->
<NetMapBackgroundColor value="0, 0, 0, 77" /> <NetMapBackgroundColor value="0, 0, 0, 77" />
<NetMapYouOwnAboveWater value="0, 255, 255, 255" /> <NetMapYouOwnAboveWater value="0, 255, 255, 255" />