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

Fixes bug #79

Browse Source
This commit is contained in:
Siana Gearz
2011-11-08 21:54:26 +01:00
parent 8421661a89
commit 121a557fe5
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llnetmap.cpp
View File

@@ -396,8 +396,14 @@ void LLNetMap::draw()
LLViewerRegion* avatar_region = LLWorld::getInstance()->getRegionFromPosGlobal(positions[i]); LLViewerRegion* avatar_region = LLWorld::getInstance()->getRegionFromPosGlobal(positions[i]);
LLUUID estate_owner = avatar_region? avatar_region->getOwner() : LLUUID::null; LLUUID estate_owner = avatar_region? avatar_region->getOwner() : LLUUID::null;
// MOYMOD Minimap custom av colors.
boost::unordered_map<const LLUUID,LLColor4>::const_iterator it = mm_MarkerColors.find(avatar_ids[i]);
if(it != mm_MarkerColors.end())
{
avColor = it->second;
}
//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)) else if(LLMuteList::getInstance()->isLinden(avName))
{ {
avColor = linden_color; avColor = linden_color;
} }
@@ -411,15 +417,6 @@ void LLNetMap::draw()
{ {
avColor = friend_color; avColor = friend_color;
} }
else
{
// MOYMOD Minimap custom av colors.
boost::unordered_map<const LLUUID,LLColor4>::const_iterator it = mm_MarkerColors.find(avatar_ids[i]);
if(it != mm_MarkerColors.end())
{
avColor = it->second;
}
}
LLWorldMapView::drawAvatar( LLWorldMapView::drawAvatar(
pos_map.mV[VX], pos_map.mV[VY], pos_map.mV[VX], pos_map.mV[VY],