Draw Imprudence developers as purple dots in the mini-map (name list in LLFloaterMap)

5 files changed, 25 insertions, 1 deletions

diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 6d23ab4..c60f07f 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -194,6 +194,21 @@ void LLFloaterMap::open()
 */
 
 //static
+bool LLFloaterMap::isImpDev(LLUUID agent_id)
+{
+        // We use strings here as avatar keys change across grids. 
+        // Feel free to add/remove yourself.
+        std::string agent_name = getSelectedName(agent_id);
+        if (agent_name == "McCabe Maxsted" || 
+                agent_name == "Jacek Antonelli" ||
+                agent_name == "Armin Weatherwax")
+        {
+                return true;
+        }
+        return false;
+}
+
+//static
 void LLFloaterMap::updateRadar()
 {
         LLFloaterMap::getInstance()->populateRadar();
diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index 81e4159..349b0e6 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -49,6 +49,8 @@ public:
 
         static void updateRadar();
         static LLUUID getSelected();
+        // returns true if agent_id belongs to a developer listed in llfloatermap.cpp
+        static bool isImpDev(LLUUID agent_id);
 
         BOOL postBuild();
 
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index dc4a4ae..5aaee1a 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -344,6 +344,7 @@ 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;
                 int selected = -1;
 
@@ -369,6 +370,10 @@ void LLNetMap::draw()
                                 {
                                         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;
@@ -403,7 +408,7 @@ void LLNetMap::draw()
                 }
 
                 // Draw dot for selected avatar last
-                if (selected >= 0)
+                if (selected >= 0 && avatar_ids[selected].notNull())
                 {
                         pos_map = globalPosToView(positions[selected], rotate_map);
                         F32 glyph_radius = mDotRadius * 1.7f;
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 854c027..14265e0 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -163,6 +163,7 @@
 <MapFriend value="255, 255, 0, 255" />                  <!-- Your friends' glyph color -->
 <MapMuted value="128, 128, 128, 255" />                 <!-- Muted avatars' glyph color -->
 <MapSelected value="255, 0, 0, 255" />                  <!-- Selected avatars' glyph color -->
+<MapImpDev value="90, 45, 101, 255" />                  <!-- Imprudence developers glyph color -->
   
   <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index f129230..6dc98dc 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -163,6 +163,7 @@
 <MapFriend value="255, 255, 0, 255" />                  <!-- Your friends' glyph color -->
 <MapMuted value="128, 128, 128, 255" />                 <!-- Muted avatars' glyph color -->
 <MapSelected value="255, 0, 0, 255" />                  <!-- Selected avatars' glyph color -->
+<MapImpDev value="90, 45, 101, 255" />                  <!-- Imprudence developers glyph color -->
  
 <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->