1 files changed, 54 insertions, 15 deletions

diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 5e51e6f..947bdfd 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -71,9 +71,10 @@ const S32 SCROLL_HINT_WIDTH = 65;
 const F32 BIG_DOT_RADIUS = 5.f;
 BOOL LLWorldMapView::sHandledLastClick = FALSE;
 
-LLUIImagePtr LLWorldMapView::sAvatarYouSmallImage = NULL;
 LLUIImagePtr LLWorldMapView::sAvatarSmallImage = NULL;
-LLUIImagePtr LLWorldMapView::sAvatarLargeImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarYouImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarYouLargeImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarLevelImage = NULL;
 LLUIImagePtr LLWorldMapView::sAvatarAboveImage = NULL;
 LLUIImagePtr LLWorldMapView::sAvatarBelowImage = NULL;
 
@@ -113,11 +114,12 @@ std::map<std::string,std::string> LLWorldMapView::sStringsMap;
 
 void LLWorldMapView::initClass()
 {
-        sAvatarYouSmallImage =  LLUI::getUIImage("map_avatar_you_8.tga");
         sAvatarSmallImage =     LLUI::getUIImage("map_avatar_8.tga");
-        sAvatarLargeImage =     LLUI::getUIImage("map_avatar_16.tga");
-        sAvatarAboveImage =     LLUI::getUIImage("map_avatar_above_8.tga");
-        sAvatarBelowImage =     LLUI::getUIImage("map_avatar_below_8.tga");
+        sAvatarYouImage =               LLUI::getUIImage("map_avatar_16.tga");
+        sAvatarYouLargeImage =  LLUI::getUIImage("map_avatar_you_32.tga");
+        sAvatarLevelImage =     LLUI::getUIImage("map_avatar_32.tga");
+        sAvatarAboveImage =     LLUI::getUIImage("map_avatar_above_32.tga");
+        sAvatarBelowImage =     LLUI::getUIImage("map_avatar_below_32.tga");
 
         sHomeImage =                    LLUI::getUIImage("map_home.tga");
         sTelehubImage =                 LLUI::getUIImage("map_telehub.tga");
@@ -137,9 +139,10 @@ void LLWorldMapView::initClass()
 // static
 void LLWorldMapView::cleanupClass()
 {
-        sAvatarYouSmallImage = NULL;
         sAvatarSmallImage = NULL;
-        sAvatarLargeImage = NULL;
+        sAvatarYouImage = NULL;
+        sAvatarYouLargeImage = NULL;
+        sAvatarLevelImage = NULL;
         sAvatarAboveImage = NULL;
         sAvatarBelowImage = NULL;
 
@@ -606,7 +609,11 @@ void LLWorldMapView::draw()
                         gGL.end();
                 }
 
-                // If this is mature, and you are not, draw a line across it
+                // As part of the AO project, we no longer want to draw access indicators;
+                // it's too complicated to get all the rules straight and will only 
+                // cause confusion.
+                /**********************
+                 // If this is mature, and you are not, draw a line across it
                 if (info->mAccess != SIM_ACCESS_DOWN
                         && info->mAccess > SIM_ACCESS_PG
                         && gAgent.isTeen())
@@ -622,6 +629,7 @@ void LLWorldMapView::draw()
                                 gGL.vertex2f(right, top);
                         gGL.end();
                 }
+                 **********************/
 
                 // Draw the region name in the lower left corner
                 LLFontGL* font = LLFontGL::sSansSerifSmall;
@@ -651,6 +659,33 @@ void LLWorldMapView::draw()
                         {
                                 mesg = llformat( "%s (%s)", info->mName.c_str(), sStringsMap["offline"].c_str());
                         }
+                        else if (gSavedSettings.getBOOL("MapShowAgentCount") && gSavedSettings.getBOOL("MapShowPeople"))
+                        {
+                                // Display the agent count after the region name
+                                S32 agent_count = LLWorldMap::getInstance()->mNumAgents[handle];
+                                LLViewerRegion *region = gAgent.getRegion();
+
+                                if (region && region->getHandle() == info->mHandle)
+                                {
+                                        ++agent_count; // Bump by 1 if we're in this region
+                                }
+
+                                if (agent_count > 0)
+                                {
+                                        //TODO: move this and the tooltip strings into XML
+                                        std::string count = llformat("%d %s", agent_count, agent_count > 1 ? "avatars" : "avatar");
+                                        font->renderUTF8(
+                                                count, 0,
+                                                llfloor(left + 3), 
+                                                llfloor(bottom + 20),
+                                                LLColor4::white,
+                                                LLFontGL::LEFT,
+                                                LLFontGL::BASELINE,
+                                                LLFontGL::DROP_SHADOW);
+
+                                        mesg = info->mName;
+                                }
+                        }
                         else
                         {
                                 mesg = info->mName;
@@ -732,7 +767,7 @@ void LLWorldMapView::draw()
 
         // Now draw your avatar after all that other stuff.
         LLVector3d pos_global = gAgent.getPositionGlobal();
-        drawImage(pos_global, sAvatarLargeImage);
+        drawImage(pos_global, sAvatarYouImage);
 
         LLVector3 pos_map = globalPosToView(pos_global);
         if (!pointInView(llround(pos_map.mV[VX]), llround(pos_map.mV[VY])))
@@ -1161,11 +1196,11 @@ BOOL LLWorldMapView::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* stic
 
                                 if (agent_count == 1)
                                 {
-                                        message += "person";
+                                        message += "avatar";
                                 }
                                 else
                                 {
-                                        message += "people";
+                                        message += "avatars";
                                 }
                         }
                 }
@@ -1241,7 +1276,7 @@ void LLWorldMapView::drawAvatar(F32 x_pixels,
                                                                 F32 dot_radius)
 {
         const F32 HEIGHT_THRESHOLD = 7.f;
-        LLUIImagePtr dot_image = sAvatarSmallImage;
+        LLUIImagePtr dot_image = sAvatarLevelImage;
         if(relative_z < -HEIGHT_THRESHOLD) 
         {
                 dot_image = sAvatarBelowImage; 
@@ -1250,9 +1285,13 @@ void LLWorldMapView::drawAvatar(F32 x_pixels,
         { 
                 dot_image = sAvatarAboveImage;
         }
+
+        S32 dot_width = llround(dot_radius * 2.f);
         dot_image->draw(
-                llround(x_pixels) - dot_image->getWidth()/2,
-                llround(y_pixels) - dot_image->getHeight()/2, 
+                llround(x_pixels - dot_radius),
+                llround(y_pixels - dot_radius),
+                dot_width,
+                dot_width,
                 color);
 }