Show muted avatars as grey in the mini-map

1 files changed, 17 insertions, 3 deletions

diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 73c2d8b..b6f75bc 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -49,6 +49,7 @@
 #include "llfloatermap.h"
 #include "llfloaterworldmap.h"
 #include "llfocusmgr.h"
+//#include "llmutelist.h" info not being sent
 #include "lltextbox.h"
 #include "lltextureview.h"
 #include "lltracker.h"
@@ -866,7 +867,9 @@ void LLWorldMapView::drawAgents()
         F32 agents_scale = (gMapScale * 0.9f) / 256.f;
         
         LLColor4 avatar_color = gColors.getColor( "MapAvatar" );
-        LLColor4 friend_color = gColors.getColor( "MapFriend" );
+        /*LLColor4 friend_color = gColors.getColor( "MapFriend" );
+        LLColor4 muted_color = gColors.getColor( "MapMuted" );
+        LLColor4 glyph_color;*/
 
         for (handle_list_t::iterator iter = mVisibleRegions.begin(); iter != mVisibleRegions.end(); ++iter)
         {
@@ -889,7 +892,18 @@ 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)) ? friend_color : avatar_color;
+                                /*if (agent_count == 1 && LLMuteList::getInstance()->isMuted(info.mID))
+                                {
+                                        glyph_color = muted_color;
+                                }
+                                else if (agent_count == 1 && is_agent_friend(info.mID))
+                                {
+                                        glyph_color = friend_color;
+                                }
+                                else
+                                {
+                                        glyph_color = avatar_color;
+                                }*/
                                 drawImageStack(info.mPosGlobal, sAvatarSmallImage, agent_count, 3.f, avatar_color);
                         }
                         LLWorldMap::getInstance()->mNumAgents[handle] = sim_agent_count; // override mNumAgents for this sim
@@ -905,7 +919,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, glyph_color_avatar);
+                                drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, avatar_color);
                         }
                 }
         }