Parcel highlighting when selecting a name in radar is less buggy

4 files changed, 21 insertions, 13 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 37ac5ea..b535237 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,12 @@
 2009-10-13 McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * Parcel highlighting when selecting a name in radar is less buggy.
+        
+          modified:   linden/indra/newview/llfloatermap.cpp
+          modified:   linden/indra/newview/llfloatermap.h
+          modified:   linden/indra/newview/llviewermessage.cpp
+
+
         * Added history button for group chat as well.
         
           modified:   linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 49563a6..256c52e 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -290,14 +290,14 @@ void LLFloaterMap::populateRadar()
                                 {
                                         if (distance < 20.0f)
                                         {
-                                                if (!getInChatList(avatar_ids[i]))
+                                                if (!isInChatList(avatar_ids[i]))
                                                 {
                                                         addToChatList(avatar_ids[i], dist_string);
                                                 }
                                         }
                                         else
                                         {
-                                                if (getInChatList(avatar_ids[i]))
+                                                if (isInChatList(avatar_ids[i]))
                                                 {
                                                         removeFromChatList(avatar_ids[i]);
                                                 }
@@ -311,7 +311,7 @@ void LLFloaterMap::populateRadar()
 
                                 if (notify_sim)
                                 {
-                                        if (!getInChatList(avatar_ids[i]) && !getInSimAvList(avatar_ids[i]))
+                                        if (!isInChatList(avatar_ids[i]) && !getInSimAvList(avatar_ids[i]))
                                         {
                                                 LLViewerObject *av_obj = gObjectList.findObject(avatar_ids[i]);
                                                 if (av_obj != NULL && av_obj->isAvatar())
@@ -338,7 +338,7 @@ void LLFloaterMap::populateRadar()
                                 {
                                         // append typing string
                                         std::string typing = "";
-                                        if (getIsTyping(avatar_ids[i]))
+                                        if (isTyping(avatar_ids[i]))
                                         {
                                                 typing = getString("is_typing")+ " ";
                                         }
@@ -397,7 +397,7 @@ void LLFloaterMap::updateChatList(std::vector<LLUUID> agent_ids)
         }
 }
 
-bool LLFloaterMap::getInChatList(LLUUID agent_id)
+bool LLFloaterMap::isInChatList(LLUUID agent_id)
 {
         if (mChatAvatars.count(agent_id) > 0)
         {
@@ -426,7 +426,7 @@ void LLFloaterMap::removeFromChatList(LLUUID agent_id)
         mChatAvatars.erase(agent_id);
 }
 
-bool LLFloaterMap::getIsTyping(LLUUID agent_id)
+bool LLFloaterMap::isTyping(LLUUID agent_id)
 {
         if (mTypingAvatars.count(agent_id) > 0)
         {
@@ -439,7 +439,7 @@ void LLFloaterMap::updateTypingList(LLUUID agent_id, bool remove)
 {
         if (remove)
         {
-                if (getIsTyping(agent_id))
+                if (isTyping(agent_id))
                 {
                         mTypingAvatars.erase(agent_id); 
                 }
@@ -503,7 +503,7 @@ void LLFloaterMap::toggleButtons()
                 enable = mSelectedAvatar.notNull() ? visibleItemsSelected() : FALSE;
                 enable_unmute = mSelectedAvatar.notNull() ? LLMuteList::getInstance()->isMuted(mSelectedAvatar) : FALSE;
                 enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar);
-                enable_estate = getKickable(mSelectedAvatar);
+                enable_estate = isKickable(mSelectedAvatar);
                 enable_friend = !is_agent_friend(mSelectedAvatar);
         }
         else
@@ -552,7 +552,7 @@ void LLFloaterMap::toggleButtons()
 // [/RLVa:KB]
 }
 
-BOOL LLFloaterMap::getKickable(const LLUUID &agent_id)
+BOOL LLFloaterMap::isKickable(const LLUUID &agent_id)
 {
         if (agent_id.notNull())
         {
@@ -568,6 +568,7 @@ BOOL LLFloaterMap::getKickable(const LLUUID &agent_id)
                                 if (LLWorld::getInstance()->positionRegionValidGlobal(pos_global))
                                 {
                                         LLParcel* parcel = LLViewerParcelMgr::getInstance()->selectParcelAt(pos_global)->getParcel();
+                                        LLViewerParcelMgr::getInstance()->deselectLand();
                                         
                                         BOOL new_value = (region != NULL);
                                                                 
diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index af4d1cc..aedbcb8 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -52,7 +52,7 @@ public:
         // returns true if agent_id belongs to a developer listed in llfloatermap.cpp
         static bool isImpDev(LLUUID agent_id);
 
-        bool getIsTyping(LLUUID agent_id);
+        bool isTyping(LLUUID agent_id);
         void updateTypingList(LLUUID agent_id, bool remove);
 
         BOOL postBuild();
@@ -85,12 +85,12 @@ private:
         static void onList(LLUICtrl* ctrl, void* user_data);
         static void onRangeChange(LLFocusableElement* focus, void* user_data);
         BOOL visibleItemsSelected() const;
-        BOOL getKickable(const LLUUID &agent_id);
+        BOOL isKickable(const LLUUID &agent_id);
         void toggleButtons();
         void populateRadar();
 
         void updateChatList(std::vector<LLUUID> agent_ids);
-        bool getInChatList(LLUUID agent_id);
+        bool isInChatList(LLUUID agent_id);
         void addToChatList(LLUUID agent_id, std::string distance);
         void removeFromChatList(LLUUID agent_id);
 
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index d784f52..3baeec0 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2574,7 +2574,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
                         if (LLFloaterMap::getInstance())
                         {
-                                if (LLFloaterMap::getInstance()->getIsTyping(from_id))
+                                if (LLFloaterMap::getInstance()->isTyping(from_id))
                                 {
                                         LLFloaterMap::getInstance()->updateTypingList(from_id, true);
                                 }