diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index 6348132dd5..f6929b1576 100644 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -582,13 +582,6 @@ void LLNetMap::draw() LLColor4 color = map_avatar_color; // - // Mark Avatars with special colors - if (LLNetMap::sAvatarMarksMap.find(uuid) != LLNetMap::sAvatarMarksMap.end()) - { - color = LLNetMap::sAvatarMarksMap[uuid]; - } - // Mark Avatars with special colors - // Color "special" avatars with special colors (Friends, muted, Lindens, etc) static LLUICachedControl fs_colorize("FSColorizeMap"); if (fs_colorize) @@ -600,6 +593,13 @@ void LLNetMap::draw() { color = LGGContactSets::getInstance()->getFriendColor(uuid); } + + // Mark Avatars with special colors + if (LLNetMap::sAvatarMarksMap.find(uuid) != LLNetMap::sAvatarMarksMap.end()) + { + color = LLNetMap::sAvatarMarksMap[uuid]; + } + // Mark Avatars with special colors // [RLVa:KB] - Checked: 2010-04-19 (RLVa-1.2.0f) | Modified: RLVa-1.2.0f | FS-Specific LLWorldMapView::drawAvatar(