From 2781068c3fd7f405b3937ec9fabaf9e8bb378160 Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Sun, 6 Mar 2011 15:28:01 -0500
Subject: [PATCH] Bugfixe for radar. Friends list icons work again, other code
 cleanup.

---
 indra/newview/llavatarlist.cpp     | 5 +++--
 indra/newview/llavatarlistitem.cpp | 6 ++++++
 indra/newview/llavatarlistitem.h   | 2 +-
 indra/newview/llpanelpeople.cpp    | 1 +
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index 0397bf358d..d5adcdda10 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -65,7 +65,8 @@ bool LLAvatarList::contains(const LLUUID& id)
 	return std::find(ids.begin(), ids.end(), id) != ids.end();
 }
 
-void LLAvatarList::toggleIcons()
+void LLAvatarList::toggleIcons() 
+// Togggles the display of Avatar icons
 {
 	if (!mIgnoreGlobalIcons)
 	{
@@ -73,7 +74,7 @@ void LLAvatarList::toggleIcons()
 		mShowIcons = !mShowIcons;
 		gSavedSettings.setBOOL(mIconParamName, mShowIcons);
 		
-		// Show/hide icons for all existing items.
+		// Show/hide avatar icons for all existing items.
 		std::vector<LLPanel*> items;
 		getItems(items);
 		for( std::vector<LLPanel*>::const_iterator it = items.begin(); it != items.end(); it++)
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 8a80dc9c26..972d1bbace 100644
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -793,6 +793,12 @@ void LLAvatarListItem::updateChildren()
 	LL_DEBUGS("AvatarItemReshape") << "name rect after: " << name_view_rect << LL_ENDL;
 }
 
+void LLAvatarListItem::setShowPermissions(bool show)
+{
+	mShowPermissions=show;
+	showPermissions(show);
+}
+
 bool LLAvatarListItem::showPermissions(bool visible)
 {
 	
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h
index 12c749deb0..9d76a7f27a 100644
--- a/indra/newview/llavatarlistitem.h
+++ b/indra/newview/llavatarlistitem.h
@@ -118,7 +118,7 @@ public:
 	void showPaymentStatus(bool show);
 	void updateFirstSeen();
 	void showUsername(bool show);
-	void setShowPermissions(bool show) { mShowPermissions = show; };
+	void setShowPermissions(bool show);
 	void showLastInteractionTime(bool show);
 	void setAvatarIconVisible(bool visible);
 // [RLVa:KB] - Checked: 2010-04-05 (RLVa-1.2.2a) | Added: RLVa-1.2.0d
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 663c23d69f..8b3c57ead5 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -838,6 +838,7 @@ void LLPanelPeople::updateNearbyList()
 	// Fetch new list of surrounding Avs
 	std::vector<LLVector3d> positions;
 	LLWorld::getInstance()->getAvatars(&mNearbyList->getIDs(), &positions, gAgent.getPositionGlobal(), gSavedSettings.getF32("NearMeRange"));
+	mNearbyList->setDirty();
 	DISTANCE_COMPARATOR.updateAvatarsPositions(positions, mNearbyList->getIDs());
 	
 	//Compare new list with last radar cache, updating fields and processing changes