1 files changed, 124 insertions, 17 deletions

diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index e90e3b4..49563a6 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -80,6 +80,7 @@ LLFloaterMap::LLFloaterMap(const LLSD& key)
         LLUICtrlFactory::getInstance()->buildFloater(this, "floater_mini_map.xml", &factory_map, FALSE);
 
         mChatAvatars.clear();
+        mTypingAvatars.clear();
 }
 
 
@@ -95,6 +96,7 @@ BOOL LLFloaterMap::postBuild()
 {
         // Send the drag handle to the back, but make sure close stays on top
         sendChildToBack(getDragHandle());
+        sendChildToFront(getChild<LLButton>("llfloater_minimize_btn"));
         sendChildToFront(getChild<LLButton>("llfloater_close_btn"));
         setIsChrome(TRUE);
         
@@ -236,16 +238,16 @@ void LLFloaterMap::populateRadar()
 
         S32 scroll_pos = mRadarList->getScrollPos();
 
-        LLVector3d current_pos = gAgent.getPositionGlobal();
-
         // clear count
         std::stringstream avatar_count; 
         avatar_count.str("");
 
         // find what avatars you can see
+        F32 range = gSavedSettings.getF32("NearMeRange");
+        LLVector3d current_pos = gAgent.getPositionGlobal();
         std::vector<LLUUID> avatar_ids;
         std::vector<LLVector3d> positions;
-        LLWorld::getInstance()->getAvatars(&avatar_ids, &positions, current_pos, gSavedSettings.getF32("NearMeRange"));
+        LLWorld::getInstance()->getAvatars(&avatar_ids, &positions);
 
         LLSD element;
 
@@ -265,21 +267,26 @@ void LLFloaterMap::populateRadar()
                         std::string fullname = getSelectedName(avatar_ids[i]);
                         if (!fullname.empty())
                         {
+                                bool notify_chat = gSavedSettings.getBOOL("MiniMapNotifyChatRange");
+                                bool notify_sim = gSavedSettings.getBOOL("MiniMapNotifySimRange");
         // [RLVa:KB] - Alternate: Imprudence-1.2.0
                                 if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
                                 {
                                         fullname = gRlvHandler.getAnonym(fullname);
+                                        notify_chat = false;
+                                        notify_sim = false;
                                 }
         // [/RLVa:KB]
 
-                                // check if they're in chat range and notify user
+                                // check if they're in certain ranges and notify user if we've enabled that
                                 LLVector3d temp = positions[i] - current_pos;
                                 F32 distance = llround((F32)temp.magVec(), 0.1f);
-                                char dist[32];
+                                /*char dist[32];
                                 sprintf(dist, "%.1f", distance);
-                                std::string dist_string = dist;
+                                std::string dist_string = dist;*/
+                                std::string dist_string = llformat("%.1f", distance);
 
-                                if (gSavedSettings.getBOOL("MiniMapNotify"))
+                                if (notify_chat)
                                 {
                                         if (distance < 20.0f)
                                         {
@@ -295,7 +302,6 @@ void LLFloaterMap::populateRadar()
                                                         removeFromChatList(avatar_ids[i]);
                                                 }
                                         }
-
                                         updateChatList(avatar_ids);
                                 }
                                 else if (!mChatAvatars.empty())
@@ -303,16 +309,51 @@ void LLFloaterMap::populateRadar()
                                         mChatAvatars.clear();
                                 }
 
-                                std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("muted") : "";
-                                element["id"] = avatar_ids[i];
-                                element["columns"][0]["column"] = "avatar_name";
-                                element["columns"][0]["type"] = "text";
-                                element["columns"][0]["value"] = fullname + " " + mute_text;
-                                element["columns"][1]["column"] = "avatar_distance";
-                                element["columns"][1]["type"] = "text";
-                                element["columns"][1]["value"] = dist_string+"m";
+                                if (notify_sim)
+                                {
+                                        if (!getInChatList(avatar_ids[i]) && !getInSimAvList(avatar_ids[i]))
+                                        {
+                                                LLViewerObject *av_obj = gObjectList.findObject(avatar_ids[i]);
+                                                if (av_obj != NULL && av_obj->isAvatar())
+                                                {
+                                                        LLVOAvatar* avatarp = (LLVOAvatar*)av_obj;
+                                                        if (avatarp != NULL)
+                                                        {
+                                                                if (avatarp->getRegion() == gAgent.getRegion())
+                                                                {
+                                                                        addToSimAvList(avatar_ids[i], dist_string);
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                        updateSimAvList(avatar_ids);
+                                }
+                                else if (!mSimAvatars.empty())
+                                {
+                                        mSimAvatars.clear();
+                                }
+
+                                // only display avatars in range
+                                if (distance <= range)
+                                {
+                                        // append typing string
+                                        std::string typing = "";
+                                        if (getIsTyping(avatar_ids[i]))
+                                        {
+                                                typing = getString("is_typing")+ " ";
+                                        }
+
+                                        std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("is_muted") : "";
+                                        element["id"] = avatar_ids[i];
+                                        element["columns"][0]["column"] = "avatar_name";
+                                        element["columns"][0]["type"] = "text";
+                                        element["columns"][0]["value"] = typing + fullname + " " + mute_text;
+                                        element["columns"][1]["column"] = "avatar_distance";
+                                        element["columns"][1]["type"] = "text";
+                                        element["columns"][1]["value"] = dist_string+"m";
 
-                                mRadarList->addElement(element, ADD_BOTTOM);
+                                        mRadarList->addElement(element, ADD_BOTTOM);
+                                }
                         }
                 }
 
@@ -326,6 +367,7 @@ void LLFloaterMap::populateRadar()
         }
         else
         {
+                mTypingAvatars.clear();
                 mRadarList->addCommentText(getString("no_one_near"), ADD_TOP);
                 avatar_count << "0";
         }
@@ -384,6 +426,71 @@ void LLFloaterMap::removeFromChatList(LLUUID agent_id)
         mChatAvatars.erase(agent_id);
 }
 
+bool LLFloaterMap::getIsTyping(LLUUID agent_id)
+{
+        if (mTypingAvatars.count(agent_id) > 0)
+        {
+                return true;
+        }
+        return false;
+}
+
+void LLFloaterMap::updateTypingList(LLUUID agent_id, bool remove)
+{
+        if (remove)
+        {
+                if (getIsTyping(agent_id))
+                {
+                        mTypingAvatars.erase(agent_id); 
+                }
+        }
+        else
+        {
+                mTypingAvatars.insert(agent_id);
+        }
+}
+
+void LLFloaterMap::updateSimAvList(std::vector<LLUUID> agent_ids)
+{
+        std::set<LLUUID>::iterator it;
+        std::vector<LLUUID>::iterator result;
+        for (it = mSimAvatars.begin(); it != mSimAvatars.end(); )
+        {
+                result = find(agent_ids.begin(), agent_ids.end(), *it);
+                if (result == agent_ids.end())
+                {
+                        mSimAvatars.erase(it++);
+                }
+                else
+                {
+                        it++;
+                }
+        }
+}
+
+void LLFloaterMap::addToSimAvList(LLUUID agent_id, std::string distance)
+{
+        mSimAvatars.insert(agent_id);
+        LLChat chat;
+
+        LLUIString notify = getString("entering_sim_range");
+        notify.setArg("[NAME]", getSelectedName(agent_id));
+        notify.setArg("[DISTANCE]", distance);
+
+        chat.mText = notify;
+        chat.mSourceType = CHAT_SOURCE_SYSTEM;
+        LLFloaterChat::addChat(chat, FALSE, FALSE);     
+}
+
+bool LLFloaterMap::getInSimAvList(LLUUID agent_id)
+{
+        if (mSimAvatars.count(agent_id) > 0)
+        {
+                return true;
+        }
+        return false;
+}
+
 void LLFloaterMap::toggleButtons()
 {
         BOOL enable = FALSE;