livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark colors on minimap take precedence over all others

master
Ansariel 2013-05-28 12:42:16 +02:00
parent e326bf90e2
commit 133f844a50
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llnetmap.cpp
View File

@ -582,13 +582,6 @@ void LLNetMap::draw()
LLColor4 color = map_avatar_color; // <FS:CR>
// <FS:Ansariel> Mark Avatars with special colors
if (LLNetMap::sAvatarMarksMap.find(uuid) != LLNetMap::sAvatarMarksMap.end())
{
color = LLNetMap::sAvatarMarksMap[uuid];
}
// </FS:Ansariel> Mark Avatars with special colors
// <FS:CR> Color "special" avatars with special colors (Friends, muted, Lindens, etc)
static LLUICachedControl<bool> fs_colorize("FSColorizeMap");
if (fs_colorize)
@ -600,6 +593,13 @@ void LLNetMap::draw()
{
color = LGGContactSets::getInstance()->getFriendColor(uuid);
}
// <FS:Ansariel> Mark Avatars with special colors
if (LLNetMap::sAvatarMarksMap.find(uuid) != LLNetMap::sAvatarMarksMap.end())
{
color = LLNetMap::sAvatarMarksMap[uuid];
}
// </FS:Ansariel> Mark Avatars with special colors
// [RLVa:KB] - Checked: 2010-04-19 (RLVa-1.2.0f) | Modified: RLVa-1.2.0f | FS-Specific
LLWorldMapView::drawAvatar(