8 files changed, 781 insertions, 10 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 6d2f0c5..4ae2db3 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -5234,7 +5234,7 @@
               <key>Type</key>
               <string>F32</string>
               <key>Value</key>
-              <integer>20</integer>
+              <integer>96</integer>
     </map>
     <key>NewCacheLocation</key>
     <map>
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 8714d4f..29a95c2 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -42,14 +42,39 @@
 #include "llresizebar.h"
 #include "lluictrlfactory.h"
 
+// radar
+#include "llfloateravatarinfo.h"
+#include "llfloaterfriends.h"
+#include "llfloatergroupinvite.h"
+#include "llfloatergroups.h"
+#include "llfloaterreporter.h"
+#include "llimview.h"
+#include "llmutelist.h"
+#include "roles_constants.h"
+#include "llscrolllistctrl.h"
+#include "lltracker.h"
+#include "llviewerobjectlist.h"
+#include "llviewermessage.h"
+#include "llviewerregion.h"
+#include "llviewerwindow.h"
+#include "llworld.h"
+
+LLFloaterMap* LLFloaterMap::sInstance = NULL;
+
 LLFloaterMap::LLFloaterMap(const LLSD& key)
         :
         LLFloater(std::string("minimap")),
-        mPanelMap(NULL)
+        mPanelMap(NULL),
+        mUpdate(TRUE)
 {
         LLCallbackMap::map_t factory_map;
         factory_map["mini_mapview"] = LLCallbackMap(createPanelMiniMap, this);
         LLUICtrlFactory::getInstance()->buildFloater(this, "floater_mini_map.xml", &factory_map, FALSE);
+
+        mSelectedAvatar.setNull();
+        mAvatars.clear();
+
+        sInstance = this;
 }
 
 
@@ -67,12 +92,37 @@ BOOL LLFloaterMap::postBuild()
         sendChildToBack(getDragHandle());
         sendChildToFront(getChild<LLButton>("llfloater_close_btn"));
         setIsChrome(TRUE);
+        
+        mRadarList = getChild<LLScrollListCtrl>("RadarList");
+        childSetCommitCallback("RadarList", onList, this);
+        mRadarList->setDoubleClickCallback(onClickIM);
+
+        childSetFocusChangedCallback("near_me_range", onRangeChange, this);
+
+        childSetAction("im_btn", onClickIM, this);
+        childSetAction("profile_btn", onClickProfile, this);
+        childSetAction("offer_teleport_btn", onClickOfferTeleport, this);
+        childSetAction("track_btn", onClickTrack, this);
+        childSetAction("invite_btn", onClickInvite, this);
+        childSetAction("add_btn", onClickAddFriend, this);
+        childSetAction("freeze_btn", onClickFreeze, this);
+        childSetAction("eject_btn", onClickEject, this);
+        childSetAction("mute_btn", onClickMute, this);
+        childSetAction("unmute_btn", onClickUnmute, this);
+        childSetAction("ar_btn", onClickAR, this);
+        childSetAction("estate_eject_btn", onClickEjectFromEstate, this);
+
+        setDefaultBtn("im_btn");
+
+        populateRadar();
+
         return TRUE;
 }
 
 
 LLFloaterMap::~LLFloaterMap()
 {
+        sInstance = NULL;
 }
 
 
@@ -122,7 +172,6 @@ void LLFloaterMap::draw()
         }
 }
 
-
 // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-05 (RLVa-1.0.0c)
 void LLFloaterMap::open()
 {
@@ -132,3 +181,574 @@ void LLFloaterMap::open()
         }
 }
 // [/RLVa:KB]
+
+// TODO: make this detachable
+// TODO: make this expand/collapse
+
+/*
+* Imprudence Radar
+* @brief inworld radar integrated with the minimap
+* by McCabe Maxsted
+* Estate tab portion by Dale Glass
+*/
+
+//static
+void LLFloaterMap::updateRadar()
+{
+        LLFloaterMap* self = sInstance;
+        self->populateRadar();
+}
+
+void LLFloaterMap::populateRadar()
+{
+        if (!mUpdate)
+        {
+                return;
+        }
+
+        if (visibleItemsSelected())
+        {
+                mSelectedAvatar = mRadarList->getSelectedValue().asUUID();
+        }
+        else
+        {
+                mSelectedAvatar.setNull();
+        }
+
+        S32 scroll_pos = mRadarList->getScrollPos();
+
+        LLVector3d current_pos = gAgent.getPositionGlobal();
+
+        // find what avatars you can see
+        std::vector<LLUUID> avatar_ids;
+        std::vector<LLVector3d> positions;
+        LLWorld::getInstance()->getAvatars(&avatar_ids, &positions, current_pos, gSavedSettings.getF32("NearMeRange"));
+
+        // Add avatars to the list. If they're already there, update positions
+        std::pair<std::map<LLUUID, LLVector3d>::iterator, bool> ret;
+        for (U32 i=0; i<avatar_ids.size(); i++)
+        {
+                if (avatar_ids[i] == gAgent.getID() ||
+                        avatar_ids[i].isNull())
+                {
+                        continue;
+                }
+
+                ret = mAvatars.insert(std::pair<LLUUID, LLVector3d>(avatar_ids[i], positions[i]));
+                if (ret.second == false)
+                {
+                        mAvatars[avatar_ids[i]] = positions[i]; 
+                }
+        }
+
+        LLSD element;
+
+        mRadarList->deleteAllItems();
+        
+        // if an avatar's not in range anymore, kill it. Otherwise, populate radar
+        std::map<LLUUID, LLVector3d>::iterator mIt;
+        std::vector<LLUUID>::iterator result;
+        for (mIt = mAvatars.begin(); mIt != mAvatars.end(); )
+        {
+                result = find(avatar_ids.begin(), avatar_ids.end(), mIt->first);
+                if (result == avatar_ids.end())
+                {
+                        mAvatars.erase(mIt++);
+                }
+                else
+                {
+                        // Add to list only if we get their name
+                        std::string fullname = getSelectedName(mIt->first);
+                        if (!fullname.empty() && fullname != " ")
+                        {
+                                std::string mute_text = LLMuteList::getInstance()->isMuted(mIt->first) ? getString("muted") : "";
+                                element["id"] = mIt->first;
+                                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";
+
+                                F64 distance = dist_vec(current_pos, mIt->second);
+                                std::stringstream dist_formatted;
+                                dist_formatted.str("");
+                                dist_formatted << (double)((int)((distance + 0.05)*10.0))/10.0 << "m";
+                                element["columns"][1]["value"] = dist_formatted.str();
+
+                                mRadarList->addElement(element, ADD_BOTTOM);
+                        }
+                        ++mIt;
+                }
+        }
+
+        mRadarList->sortItems();
+        mRadarList->setScrollPos(scroll_pos);
+
+        if (mSelectedAvatar.notNull())
+        {
+                mRadarList->selectByID(mSelectedAvatar);
+        }
+
+        // set count
+        std::stringstream avatar_count; 
+        avatar_count.str("");
+        if (mAvatars.empty())
+        {
+                mRadarList->addCommentText(getString("no_one_near"), ADD_TOP);
+                avatar_count << "0";
+        }
+        else
+        {
+                avatar_count << (int)mAvatars.size();
+        }
+        childSetText("lblAvatarCount", avatar_count.str());
+
+        toggleButtons();
+}       
+
+void LLFloaterMap::toggleButtons()
+{
+        BOOL enabled = mRadarList->hasFocus() ? visibleItemsSelected() : FALSE;
+        BOOL unmute_enabled = mRadarList->hasFocus() ? LLMuteList::getInstance()->isMuted(mSelectedAvatar) : FALSE;
+
+        childSetEnabled("im_btn", enabled);
+        childSetEnabled("profile_btn", enabled);
+        childSetEnabled("offer_teleport_btn", enabled);
+        childSetEnabled("track_btn", enabled);
+        childSetEnabled("invite_btn", enabled);
+        childSetEnabled("add_btn", enabled);
+        childSetEnabled("freeze_btn", enabled);
+        childSetEnabled("eject_btn", enabled);
+        childSetEnabled("mute_btn", enabled);
+        childSetEnabled("unmute_btn", unmute_enabled);
+        childSetEnabled("ar_btn", enabled);
+        childSetEnabled("estate_eject_btn", enabled);
+}
+
+// static
+void LLFloaterMap::onList(LLUICtrl* ctrl, void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*)user_data;
+        if (self)
+        {
+                self->toggleButtons();
+        }
+}
+                
+
+BOOL LLFloaterMap::visibleItemsSelected() const
+{
+        if (mRadarList->getFirstSelectedIndex() >= 0)
+        {
+                return TRUE;
+        }
+        return FALSE;
+}
+
+// static
+void LLFloaterMap::onRangeChange(LLFocusableElement* focus, void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*)user_data;
+        if (self)
+        {
+                self->mUpdate = !(self->childHasFocus("near_me_range"));
+        }
+}
+
+// static
+BOOL LLFloaterMap::isSelected(LLUUID agent)
+{
+        if (sInstance->mSelectedAvatar == agent)
+        {
+                return TRUE;
+        }
+        return FALSE;
+}
+
+//
+// Avatar tab
+//
+
+// static
+void LLFloaterMap::onClickIM(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                std::string fullname;
+                if(gCacheName->getFullName(agent_id, fullname))
+                {
+                        gIMMgr->setFloaterOpen(TRUE);
+                        gIMMgr->addSession(fullname, IM_NOTHING_SPECIAL, agent_id);
+                }
+        }
+}
+
+// static
+void LLFloaterMap::onClickProfile(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                LLFloaterAvatarInfo::show(agent_id);
+        }
+}
+
+// static
+void LLFloaterMap::onClickOfferTeleport(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                handle_lure(agent_id);
+        }
+}
+
+// static
+void LLFloaterMap::onClickTrack(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLTracker::ETrackingStatus tracking_status = LLTracker::getTrackingStatus();
+        if (LLTracker::TRACKING_AVATAR == tracking_status)
+        {
+                LLTracker::stopTracking(NULL);
+        }
+        else
+        {
+                LLScrollListItem *item = self->mRadarList->getFirstSelected();
+                if (item != NULL)
+                {
+                        LLUUID agent_id = item->getUUID();
+                        std::string fullname;
+                        gCacheName->getFullName(agent_id, fullname);
+                        LLTracker::trackAvatar(agent_id, fullname);
+                }
+        }
+}
+
+// static
+void LLFloaterMap::onClickInvite(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                LLFloaterGroupPicker* widget;
+                widget = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
+                if (widget)
+                {
+                        widget->center();
+                        widget->setPowersMask(GP_MEMBER_INVITE);
+                        widget->setSelectCallback(callback_invite_to_group, (void *)&agent_id);
+                }
+        }
+}
+
+// static
+void LLFloaterMap::callback_invite_to_group(LLUUID group_id, void *user_data)
+{
+        std::vector<LLUUID> agent_ids;
+        agent_ids.push_back(*(LLUUID *)user_data);
+        
+        LLFloaterGroupInvite::showForGroup(group_id, &agent_ids);
+}
+
+// static
+void LLFloaterMap::onClickAddFriend(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                std::string fullname;
+                gCacheName->getFullName(agent_id, fullname);
+                LLPanelFriends::requestFriendshipDialog(agent_id, fullname);
+        }
+}
+
+//
+// Estate tab
+//
+
+//static 
+std::string LLFloaterMap::getSelectedName(LLUUID agent_id)
+{
+        std::string agent_name;
+        if(agent_id.notNull() && gCacheName->getFullName(agent_id, agent_name))
+        {
+                return agent_name;
+        }
+        return LLStringUtil::null;
+}
+
+//static 
+void LLFloaterMap::callbackFreeze(S32 option, void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+
+        if ( option == 0 )
+        {
+                sendFreeze(self->mSelectedAvatar, true);
+        }
+        else if ( option == 1 )
+        {
+                sendFreeze(self->mSelectedAvatar, false);
+        }
+}
+
+//static 
+void LLFloaterMap::callbackEject(S32 option, void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+ 
+        if ( option == 0 )
+        {
+                sendEject(self->mSelectedAvatar, false);
+        }
+        else if ( option == 1 )
+        {
+                sendEject(self->mSelectedAvatar, true);
+        }
+}
+
+//static 
+void LLFloaterMap::callbackEjectFromEstate(S32 option, void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+
+        if ( option == 0 )
+        {
+                cmdEstateEject(self->mSelectedAvatar);
+        } 
+        else if ( option == 1 )
+        {
+                cmdEstateBan(self->mSelectedAvatar);
+        }
+}
+
+void LLFloaterMap::onClickFreeze(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLStringUtil::format_map_t args;
+        LLSD payload;
+        args["[AVATAR_NAME]"] = self->getSelectedName(self->mSelectedAvatar);
+        gViewerWindow->alertXml("FreezeAvatarFullname", args, callbackFreeze, user_data);
+}
+
+//static
+void LLFloaterMap::onClickEject(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLStringUtil::format_map_t args;
+        LLSD payload;
+        args["AVATAR_NAME"] = self->getSelectedName(self->mSelectedAvatar);
+        gViewerWindow->alertXml("EjectAvatarFullName", args, callbackEject, user_data);
+}
+
+//static
+void LLFloaterMap::onClickMute(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+
+        LLUUID agent_id = self->mSelectedAvatar;
+        std::string agent_name = self->getSelectedName(agent_id);
+        if(!agent_name.empty())
+        {
+                if (LLMuteList::getInstance()->isMuted(agent_id))
+                {
+                        //LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        //LLMuteList::getInstance()->remove(mute);      
+                        //LLFloaterMute::getInstance()->selectMute(agent_id);
+                }
+                else
+                {
+                        LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        LLMuteList::getInstance()->add(mute);
+                }
+        }
+}
+
+//static
+void LLFloaterMap::onClickUnmute(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+
+        LLUUID agent_id = self->mSelectedAvatar;
+        std::string agent_name = self->getSelectedName(agent_id);
+        if(!agent_name.empty())
+        {
+                if (LLMuteList::getInstance()->isMuted(agent_id))
+                {
+                        LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        LLMuteList::getInstance()->remove(mute);        
+                        //LLFloaterMute::getInstance()->selectMute(agent_id);
+                }
+                else
+                {
+                        //LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        //LLMuteList::getInstance()->add(mute);
+                }
+        }
+}
+
+//static
+void LLFloaterMap::onClickEjectFromEstate(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLStringUtil::format_map_t args;
+        LLSD payload;
+        args["EVIL_USER"] = self->getSelectedName(self->mSelectedAvatar);
+        gViewerWindow->alertXml("EstateKickUser", args, callbackEjectFromEstate, user_data);
+}
+
+//static
+void LLFloaterMap::onClickAR(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLUUID agent_id = self->mSelectedAvatar;
+                
+        if (agent_id.notNull())
+        {
+                        LLFloaterReporter::showFromObject(agent_id);
+        }
+}
+
+// static 
+void LLFloaterMap::cmdEstateEject(const LLUUID &avatar)
+{ 
+        sendEstateMessage("teleporthomeuser", avatar); 
+}
+
+// static 
+void LLFloaterMap::cmdEstateBan(const LLUUID &avatar)
+{
+        sendEstateMessage("teleporthomeuser", avatar); // Kick first, just to be sure
+        sendEstateBan(avatar);
+}
+
+// static 
+void LLFloaterMap::sendFreeze(const LLUUID& avatar_id, bool freeze)
+{
+        U32 flags = 0x0;
+        if (!freeze)
+        {
+                // unfreeze
+                flags |= 0x1;
+        }
+
+        LLMessageSystem* msg = gMessageSystem;
+        LLViewerObject* avatar = gObjectList.findObject(avatar_id);
+
+        if (avatar)
+        {
+                msg->newMessage("FreezeUser");
+                msg->nextBlock("AgentData");
+                msg->addUUID("AgentID", gAgent.getID());
+                msg->addUUID("SessionID", gAgent.getSessionID());
+                msg->nextBlock("Data");
+                msg->addUUID("TargetID", avatar_id );
+                msg->addU32("Flags", flags );
+                msg->sendReliable( avatar->getRegion()->getHost() );
+        }
+}
+
+// static 
+void LLFloaterMap::sendEject(const LLUUID& avatar_id, bool ban)
+{       
+        LLMessageSystem* msg = gMessageSystem;
+        LLViewerObject* avatar = gObjectList.findObject(avatar_id);
+
+        if (avatar)
+        {
+                U32 flags = 0x0;
+                if ( ban )
+                {
+                        // eject and add to ban list
+                        flags |= 0x1;
+                }
+
+                msg->newMessage("EjectUser");
+                msg->nextBlock("AgentData");
+                msg->addUUID("AgentID", gAgent.getID() );
+                msg->addUUID("SessionID", gAgent.getSessionID() );
+                msg->nextBlock("Data");
+                msg->addUUID("TargetID", avatar_id );
+                msg->addU32("Flags", flags );
+                msg->sendReliable( avatar->getRegion()->getHost() );
+        }
+}
+
+// static 
+void LLFloaterMap::sendEstateMessage(const char* request, const LLUUID &target)
+{
+
+        LLMessageSystem* msg = gMessageSystem;
+        LLUUID invoice;
+
+        // This seems to provide an ID so that the sim can say which request it's
+        // replying to. I think this can be ignored for now.
+        invoice.generate();
+
+        llinfos << "Sending estate request '" << request << "'" << llendl;
+        msg->newMessage("EstateOwnerMessage");
+        msg->nextBlockFast(_PREHASH_AgentData);
+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
+        msg->nextBlock("MethodData");
+        msg->addString("Method", request);
+        msg->addUUID("Invoice", invoice);
+
+        // Agent id
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", gAgent.getID().asString().c_str());
+
+        // Target
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", target.asString().c_str());
+
+        msg->sendReliable(gAgent.getRegion()->getHost());
+}
+
+// static 
+void LLFloaterMap::sendEstateBan(const LLUUID& agent)
+{
+        LLUUID invoice;
+        U32 flags = ESTATE_ACCESS_BANNED_AGENT_ADD;
+
+        invoice.generate();
+
+        LLMessageSystem* msg = gMessageSystem;
+        msg->newMessage("EstateOwnerMessage");
+        msg->nextBlockFast(_PREHASH_AgentData);
+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
+
+        msg->nextBlock("MethodData");
+        msg->addString("Method", "estateaccessdelta");
+        msg->addUUID("Invoice", invoice);
+
+        char buf[MAX_STRING];           /* Flawfinder: ignore*/
+        gAgent.getID().toString(buf);
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", buf);
+
+        snprintf(buf, MAX_STRING, "%u", flags);                 /* Flawfinder: ignore */
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", buf);
+
+        agent.toString(buf);
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", buf);
+
+        gAgent.sendReliableMessage();
+}
diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index 857b1ed..0fff8a3 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -33,6 +33,7 @@
 #define LL_LLFLOATERMAP_H
 
 #include "llfloater.h"
+#include "llscrolllistctrl.h"
 
 class LLNetMap;
 
@@ -46,6 +47,9 @@ public:
 
         static void* createPanelMiniMap(void* data);
 
+        static void updateRadar();
+        static BOOL isSelected(LLUUID agent);
+
         BOOL postBuild();
 
         /*virtual*/ void        draw();
@@ -59,7 +63,47 @@ public:
 
 private:
         LLFloaterMap(const LLSD& key = LLSD());
-        LLNetMap*               mPanelMap;
+
+        LLNetMap*                                               mPanelMap;
+        LLScrollListCtrl*                               mRadarList;
+        LLUUID                                                  mSelectedAvatar;
+        std::map<LLUUID, LLVector3d>    mAvatars;
+        bool                                                    mUpdate;
+        static LLFloaterMap*                    sInstance;
+        
+        static void onList(LLUICtrl* ctrl, void* user_data);
+        static void onRangeChange(LLFocusableElement* focus, void* user_data);
+        BOOL visibleItemsSelected() const;
+        void toggleButtons();
+        void populateRadar();
+
+        static void onClickProfile(void* user_data);
+        static void onClickIM(void* user_data);
+        static void onClickAddFriend(void* user_data);
+        static void onClickOfferTeleport(void* user_data);
+        static void onClickTrack(void* user_data);
+        static void onClickInvite(void* user_data);
+        static void callback_invite_to_group(LLUUID group_id, void *user_data);
+
+        static std::string getSelectedName(LLUUID agent_id);
+        static void onClickFreeze(void *user_data);
+        static void onClickEject(void *user_data);
+        static void onClickMute(void *user_data);
+        static void onClickUnmute(void *user_data);
+        static void onClickAR(void *user_data);
+        static void onClickEjectFromEstate(void *user_data);
+
+        static void callbackFreeze(S32 option, void *user_data);
+        static void callbackEject(S32 option, void *user_data);
+        static void callbackAR(void *user_data);
+        static void callbackEjectFromEstate(S32 option, void *user_data);
+
+        static void sendFreeze(const LLUUID &avatar, bool);
+        static void sendEject(const LLUUID &avatar, bool);
+        static void cmdEstateEject(const LLUUID &avatar);
+        static void cmdEstateBan(const LLUUID &avatar);
+        static void sendEstateBan(const LLUUID& agent);
+        static void sendEstateMessage(const char* request, const LLUUID &target);
 };
 
 #endif  // LL_LLFLOATERMAP_H
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 8f5d90d..c66e816 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -45,6 +45,7 @@
 #include "llcolorscheme.h"
 #include "llviewercontrol.h"
 #include "llfloateravatarinfo.h"
+#include "llfloatermap.h"
 #include "llfloaterworldmap.h"
 #include "llframetimer.h"
 #include "llmutelist.h"
@@ -117,6 +118,11 @@ LLNetMap::LLNetMap(const std::string& name) :
         mPopupMenuHandle = menu->getHandle();
 }
 
+BOOL LLNetMap::postBuild()
+{
+        return TRUE;
+}
+
 LLNetMap::~LLNetMap()
 {
 }
@@ -330,6 +336,7 @@ void LLNetMap::draw()
                 LLColor4 avatar_color = gColors.getColor( "MapAvatar" );
                 LLColor4 friend_color = gColors.getColor( "MapFriend" );
                 LLColor4 muted_color = gColors.getColor( "MapMuted" );
+                LLColor4 selected_color = gColors.getColor( "MapSelected" );
                 LLColor4 glyph_color;
 
                 std::vector<LLUUID> avatar_ids;
@@ -350,6 +357,10 @@ void LLNetMap::draw()
                         {
                                 glyph_color = friend_color;
                         }
+                        else if (LLFloaterMap::isSelected(avatar_ids[i]))
+                        {
+                                glyph_color = selected_color;
+                        }
                         else
                         {
                                 glyph_color = avatar_color;
@@ -460,6 +471,8 @@ void LLNetMap::draw()
         setDirectionPos( getChild<LLTextBox>("se_label"), rotation + F_PI + F_PI_BY_TWO + F_PI_BY_TWO / 2);
 
         LLView::draw();
+
+        LLFloaterMap::updateRadar();
 }
 
 void LLNetMap::reshape(S32 width, S32 height, BOOL called_from_parent)
diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h
index ef046d8..45b5e2d 100644
--- a/linden/indra/newview/llnetmap.h
+++ b/linden/indra/newview/llnetmap.h
@@ -52,6 +52,8 @@ class LLNetMap : public LLPanel
 {
 public:
         LLNetMap(const std::string& name);
+
+        virtual BOOL postBuild();
         virtual ~LLNetMap();
 
         virtual void    draw();
@@ -111,8 +113,8 @@ private:
         LLPointer<LLImageGL>    mObjectImagep;
 
 private:
-        LLUUID                  mClosestAgentToCursor;
-        LLUUID                  mClosestAgentAtLastRightClick;
+        LLUUID                          mClosestAgentToCursor;
+        LLUUID                          mClosestAgentAtLastRightClick;
 
         static BOOL             sRotateMap;
         static LLNetMap*        sInstance;
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index d0f1049..9ad1787 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -162,6 +162,7 @@
 <MapAvatar value="0, 255, 0, 255" />                    <!-- Your avatar's glyph color -->
 <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 -->
   
   <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index 9f1e164..3425c65 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -1,7 +1,98 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="true"
-         can_tear_off="false" follows="top|right" height="220" min_height="64" min_width="64"
+         can_tear_off="false" follows="top|right" height="455" min_height="64" min_width="64"
          name="minimap" rect_control="FloaterMiniMapRect" width="200">
-    <panel bottom="2" follows="left|top|right|bottom" height="216" label="Mini Map"
-                 left="2" mouse_opaque="false" name="mini_mapview" width="196" />
+
+  <panel label="Mini Map" name="mini_mapview"
+         top="-2" left="2" bottom="196" right="196"
+         follows="left|top|right|bottom" mouse_opaque="false"  />
+
+  <panel name="RadarPanel" label="Radar"
+         background_visible="true" bg_alpha_color="NetMapBackgroundColor"
+         left="2" top="196" right="196" height="120"
+         follows="left|right|bottom" border="false" mouse_opaque="true">
+
+    <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom="-20" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+       mouse_opaque="true" name="lblAvatarCount" v_pad="0"
+       width="220">
+      0
+    </text>
+    <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom="-20" drop_shadow_visible="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="16" left="27"
+        mouse_opaque="true" name="avatars_in" v_pad="0"
+        width="220">
+      Avatars in
+    </text>
+    <slider bottom_delta="0" left_delta="55" follows="left|top" width="110" height="15"
+         name="near_me_range" label="" control_name="NearMeRange"
+         min_val="5" max_val="512" increment="1" initial_val="96" decimal_digits="0" />
+    <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+         bottom_delta="0" left="190" drop_shadow_visible="true" follows="left|top"
+         font="SansSerifSmall" h_pad="0" halign="left" height="15"
+         mouse_opaque="true" name="meters" v_pad="0"
+         width="40">
+      Meters
+    </text>
+    <tab_container border="false" bottom_delta="-179" height="174" left="0" mouse_opaque="false"
+                       name="button_container" tab_position="top" follows="left|right|bottom" width="198">
+      <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
+                       label="Avatars" left="1" mouse_opaque="true" name="avatar_tab" width="198">
+        <button bottom="-25" follows="top|right" height="22" label="IM/Call"
+             left="-85" name="im_btn" tool_tip="Open Instant Message session"
+             width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Profile"
+             left_delta="0" name="profile_btn"
+             tool_tip="Show picture, groups, and other information" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Teleport..."
+             left_delta="0" name="offer_teleport_btn"
+             tool_tip="Offer this friend a teleport to your current location" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Track"
+             left_delta="0" name="track_btn"
+             tool_tip="Create a beacon to track this avatar" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Invite..."
+             left_delta="0" name="invite_btn"
+             tool_tip="Remove this person from your friends list" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Add..."
+             left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident"
+             width="80" />
+      </panel>
+      <panel border="true" bottom="-160" follows="left|top|right|bottom" height="160"
+                       label="Estate" left="1" mouse_opaque="true" name="estate_tab" width="198">
+        <button bottom="-25" follows="top|right" height="22" label="Freeze..."
+             left="-85" name="freeze_btn" tool_tip=""
+             width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Eject..."
+             left_delta="0" name="eject_btn"
+             tool_tip="" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Mute..."
+             left_delta="0" name="mute_btn"
+             tool_tip="" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Unmute..."
+             left_delta="0" name="unmute_btn"
+             tool_tip="" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Report..."
+             left_delta="0" name="ar_btn"
+             tool_tip="" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Estate..."
+             left_delta="0" name="estate_eject_btn" tool_tip=""
+             width="80" />
+      </panel>
+    </tab_container>
+    <scroll_list bottom="-187" width="96" height="140" left="10"
+         follows="left|bottom|right" draw_border="false" draw_heading="true"
+         draw_stripes="true" column_padding="5" sort_column="1" mouse_opaque="true"
+         background_visible="true" multi_select="false" name="RadarList">
+      <column name="avatar_name" label="Name" dynamicwidth="true" />
+      <column name="avatar_distance" label="Dist." width="55" />
+    </scroll_list>
+  </panel>
+  <string name="no_one_near">
+    No avatars within range
+  </string>
+  <string name="muted">
+    (muted)
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
index 1a93341..19faa62 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel background_opaque="false" background_visible="true" bg_alpha_color="NetMapBackgroundColor"
-         border="false" follows="left|top|right|bottom" height="216" label="Mini Map"
+         border="false" follows="left|top|right|bottom" height="716" label="Mini Map"
          mouse_opaque="false" name="mini_mapview" width="196">
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                  bottom="-40" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"