1 files changed, 34 insertions, 2 deletions

diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index e90e3b4..ae5b2b6 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();
 }
 
 
@@ -303,11 +304,18 @@ void LLFloaterMap::populateRadar()
                                         mChatAvatars.clear();
                                 }
 
-                                std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("muted") : "";
+                                // 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"] = fullname + " " + mute_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";
@@ -384,6 +392,30 @@ 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::toggleButtons()
 {
         BOOL enable = FALSE;