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