Friends dots show as yellow and color can be set in colors.xml

1 files changed, 5 insertions, 3 deletions

diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 92d9588..0d266dd 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -208,6 +208,8 @@ LLWorldMapView::LLWorldMapView(const std::string& name, const LLRect& rect )
         mTextBoxNorthWest = new LLTextBox( std::string("NW"), minor_dir_rect );
         mTextBoxNorthWest->setColor( minor_color );
         addChild( mTextBoxNorthWest );
+
+        glyph_color_avatar = gColors.getColor("NetMapGlyphColorAvatar");
 }
 
 
@@ -886,8 +888,8 @@ void LLWorldMapView::drawAgents()
                                 S32 agent_count = info.mExtra;
                                 sim_agent_count += info.mExtra;
                                 // Here's how we'd choose the color if info.mID were available but it's not being sent:
-                                //LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? gFriendMapColor : gAvatarMapColor;
-                                drawImageStack(info.mPosGlobal, sAvatarSmallImage, agent_count, 3.f, gAvatarMapColor);
+                                //LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? glyph_color_friend : glyph_color_avatar;
+                                drawImageStack(info.mPosGlobal, sAvatarSmallImage, agent_count, 3.f, glyph_color_avatar);
                         }
                         LLWorldMap::getInstance()->mNumAgents[handle] = sim_agent_count; // override mNumAgents for this sim
                 }
@@ -902,7 +904,7 @@ void LLWorldMapView::drawAgents()
                                 region_center[VY] += REGION_WIDTH_METERS / 2;
                                 // Reduce the stack size as you zoom out - always display at lease one agent where there is one or more
                                 S32 agent_count = (S32)(((num_agents-1) * agents_scale + (num_agents-1) * 0.1f)+.1f) + 1;
-                                drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, gAvatarMapColor);
+                                drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, glyph_color_avatar);
                         }
                 }
         }