From b86a81bb6a425234238770c7ff997e92b94777f1 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 15 Sep 2009 23:44:25 -0700
Subject: Some code cleanup

---
 linden/indra/newview/llfloatermap.cpp | 31 +++++++++----------------------
 linden/indra/newview/llfloatermap.h   |  3 +--
 linden/indra/newview/llnetmap.cpp     | 12 ++++++------
 3 files changed, 16 insertions(+), 30 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 29a95c2..748bb7e 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -59,8 +59,6 @@
 #include "llviewerwindow.h"
 #include "llworld.h"
 
-LLFloaterMap* LLFloaterMap::sInstance = NULL;
-
 LLFloaterMap::LLFloaterMap(const LLSD& key)
 	:
 	LLFloater(std::string("minimap")),
@@ -73,8 +71,6 @@ LLFloaterMap::LLFloaterMap(const LLSD& key)
 
 	mSelectedAvatar.setNull();
 	mAvatars.clear();
-
-	sInstance = this;
 }
 
 
@@ -122,7 +118,6 @@ BOOL LLFloaterMap::postBuild()
 
 LLFloaterMap::~LLFloaterMap()
 {
-	sInstance = NULL;
 }
 
 
@@ -195,8 +190,7 @@ void LLFloaterMap::open()
 //static
 void LLFloaterMap::updateRadar()
 {
-	LLFloaterMap* self = sInstance;
-	self->populateRadar();
+	LLFloaterMap::getInstance()->populateRadar();
 }
 
 void LLFloaterMap::populateRadar()
@@ -208,7 +202,7 @@ void LLFloaterMap::populateRadar()
 
 	if (visibleItemsSelected())
 	{
-		mSelectedAvatar = mRadarList->getSelectedValue().asUUID();
+		mSelectedAvatar = mRadarList->getFirstSelected()->getUUID();
 	}
 	else
 	{
@@ -283,11 +277,7 @@ void LLFloaterMap::populateRadar()
 
 	mRadarList->sortItems();
 	mRadarList->setScrollPos(scroll_pos);
-
-	if (mSelectedAvatar.notNull())
-	{
-		mRadarList->selectByID(mSelectedAvatar);
-	}
+	mRadarList->selectByID(mSelectedAvatar);
 
 	// set count
 	std::stringstream avatar_count; 
@@ -304,12 +294,14 @@ void LLFloaterMap::populateRadar()
 	childSetText("lblAvatarCount", avatar_count.str());
 
 	toggleButtons();
+
+	//llinfos << "mSelectedAvatar: " << mSelectedAvatar.asString() << llendl;
 }	
 
 void LLFloaterMap::toggleButtons()
 {
-	BOOL enabled = mRadarList->hasFocus() ? visibleItemsSelected() : FALSE;
-	BOOL unmute_enabled = mRadarList->hasFocus() ? LLMuteList::getInstance()->isMuted(mSelectedAvatar) : FALSE;
+	BOOL enabled = mSelectedAvatar.notNull() ? visibleItemsSelected() : FALSE;
+	BOOL unmute_enabled = mSelectedAvatar.notNull() ? LLMuteList::getInstance()->isMuted(mSelectedAvatar) : FALSE;
 
 	childSetEnabled("im_btn", enabled);
 	childSetEnabled("profile_btn", enabled);
@@ -334,7 +326,6 @@ void LLFloaterMap::onList(LLUICtrl* ctrl, void* user_data)
 		self->toggleButtons();
 	}
 }
-		
 
 BOOL LLFloaterMap::visibleItemsSelected() const
 {
@@ -356,13 +347,9 @@ void LLFloaterMap::onRangeChange(LLFocusableElement* focus, void* user_data)
 }
 
 // static
-BOOL LLFloaterMap::isSelected(LLUUID agent)
+LLUUID LLFloaterMap::getSelected()
 {
-	if (sInstance->mSelectedAvatar == agent)
-	{
-		return TRUE;
-	}
-	return FALSE;
+	return LLFloaterMap::getInstance()->mSelectedAvatar;
 }
 
 //
diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index 0fff8a3..09fce01 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -48,7 +48,7 @@ public:
 	static void* createPanelMiniMap(void* data);
 
 	static void updateRadar();
-	static BOOL isSelected(LLUUID agent);
+	static LLUUID getSelected();
 
 	BOOL postBuild();
 
@@ -69,7 +69,6 @@ private:
 	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);
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index c66e816..1f6f6bd 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -347,9 +347,13 @@ void LLNetMap::draw()
 			// TODO: it'd be very cool to draw these in sorted order from lowest Z to highest.
 			// just be careful to sort the avatar IDs along with the positions. -MG
 			pos_map = globalPosToView(positions[i], rotate_map);
-
+			
+			if (LLFloaterMap::getSelected() == avatar_ids[i])
+			{
+				glyph_color = selected_color;
+			}
 			// Show them muted even if they're friends
-			if (LLMuteList::getInstance()->isMuted(avatar_ids[i]))
+			else if (LLMuteList::getInstance()->isMuted(avatar_ids[i]))
 			{
 				glyph_color = muted_color;
 			}
@@ -357,10 +361,6 @@ void LLNetMap::draw()
 			{
 				glyph_color = friend_color;
 			}
-			else if (LLFloaterMap::isSelected(avatar_ids[i]))
-			{
-				glyph_color = selected_color;
-			}
 			else
 			{
 				glyph_color = avatar_color;
-- 
cgit v1.1