1 files changed, 31 insertions, 5 deletions

diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index f055dbc..5aaee1a 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -344,8 +344,9 @@ void LLNetMap::draw()
                 LLColor4 friend_color = gColors.getColor( "MapFriend" );
                 LLColor4 muted_color = gColors.getColor( "MapMuted" );
                 LLColor4 selected_color = gColors.getColor( "MapSelected" );
+                LLColor4 imp_dev_color = gColors.getColor( "MapImpDev" );
                 LLColor4 glyph_color;
-                F32 glyph_radius;
+                int selected = -1;
 
                 std::vector<LLUUID> avatar_ids;
                 std::vector<LLVector3d> positions;
@@ -356,19 +357,23 @@ void LLNetMap::draw()
                         // just be careful to sort the avatar IDs along with the positions. -MG
                         pos_map = globalPosToView(positions[i], rotate_map);
                         
+                        // Save this entry to draw last
                         if (LLFloaterMap::getSelected() == avatar_ids[i])
                         {
-                                glyph_radius = mDotRadius * 1.7f;
-                                glyph_color = selected_color;
+                                selected = i;
+                                continue;
                         }
                         else
                         {
-                                glyph_radius = mDotRadius;
                                 // Show them muted even if they're friends
                                 if (LLMuteList::getInstance()->isMuted(avatar_ids[i]))
                                 {
                                         glyph_color = muted_color;
                                 }
+                                else if (LLFloaterMap::isImpDev(avatar_ids[i]))
+                                {
+                                        glyph_color = imp_dev_color;
+                                }
                                 else if (is_agent_friend(avatar_ids[i]))
                                 {
                                         glyph_color = friend_color;
@@ -392,7 +397,7 @@ void LLNetMap::draw()
                                 pos_map.mV[VX], pos_map.mV[VY], 
                                 glyph_color, 
                                 pos_map.mV[VZ],
-                                glyph_radius);
+                                mDotRadius);
 
                         F32     dist_to_cursor = dist_vec(LLVector2(pos_map.mV[VX], pos_map.mV[VY]), LLVector2(local_mouse_x,local_mouse_y));
                         if(dist_to_cursor < min_pick_dist && dist_to_cursor < closest_dist)
@@ -402,6 +407,27 @@ void LLNetMap::draw()
                         }
                 }
 
+                // Draw dot for selected avatar last
+                if (selected >= 0 && avatar_ids[selected].notNull())
+                {
+                        pos_map = globalPosToView(positions[selected], rotate_map);
+                        F32 glyph_radius = mDotRadius * 1.7f;
+                        glyph_color = selected_color;
+
+                        LLWorldMapView::drawAvatar(
+                                pos_map.mV[VX], pos_map.mV[VY], 
+                                glyph_color, 
+                                pos_map.mV[VZ],
+                                glyph_radius);
+
+                        F32     dist_to_cursor = dist_vec(LLVector2(pos_map.mV[VX], pos_map.mV[VY]), LLVector2(local_mouse_x,local_mouse_y));
+                        if(dist_to_cursor < min_pick_dist && dist_to_cursor < closest_dist)
+                        {
+                                closest_dist = dist_to_cursor;
+                                mClosestAgentToCursor = avatar_ids[selected];
+                        }
+                }
+
                 // Draw dot for autopilot target
                 if (gAgent.getAutoPilot())
                 {