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

Client definitions were mucked with to poke Emerald.

Browse Source 
People complained about the color of Friends in the avatar list, so I started adding support to change that (And made it account-specific as all the color stuff is designed to be). Didn't finish it, though.
The windlight popup is still broke as fuck when you start up, opening and closing it fixes it but no amount of basic common sense fixes it.
Changes to the client definitions to try to add our own colors worked, but the definitions file fucked off in the process so the client ID thing is sort of broken. Rather than trying to fix it, I think we'll just move onto the method described by Hazim/Zwagoth, which was closer to what we'd been trying to develop. I propose we just make people show up as Ascent and remove the tag reporting, honestly.
This commit is contained in:
Beeks
2010-09-02 22:10:56 -04:00
parent 800777f750
commit d9cf8144e4
13 changed files with 310 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llnetmap.cpp
View File

@@ -356,22 +356,34 @@ void LLNetMap::draw()
//Lindens are always more Linden than your friend, make that take precedence
if(LLMuteList::getInstance()->isLinden(avName))
{
avColor = gColors.getColor( "MapLinden" );
if (gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
avColor = gSavedSettings.getColor4("AscentLindenColor");
else
avColor = gSavedPerAccountSettings.getColor4("AscentLindenColor");
}
//check if they are an estate owner at their current position
else if(estate_owner.notNull() && avatar_ids[i] == estate_owner)
{
avColor = gColors.getColor( "MapEstateOwner" );
if (gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
avColor = gSavedSettings.getColor4("AscentEstateOwnerColor");
else
avColor = gSavedPerAccountSettings.getColor4("AscentEstateOwnerColor");
}
//without these dots, SL would suck.
else if(is_agent_friend(avatar_ids[i]))
{
avColor = gColors.getColor( "MapFriend" );
if (gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
avColor = gSavedSettings.getColor4("AscentFriendColor");
else
avColor = gSavedPerAccountSettings.getColor4("AscentFriendColor");
}
//big fat jerkface who is probably a jerk, display them as such.
else if(LLMuteList::getInstance()->isMuted(avatar_ids[i]))
{
avColor = gColors.getColor( "MapMuted" );
if (gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
avColor = gSavedSettings.getColor4("AscentMutedColor");
else
avColor = gSavedPerAccountSettings.getColor4("AscentMutedColor");
}
LLWorldMapView::drawAvatar(