From 46d2d47ea6dcca6e1ae09b9774c4a4ed58910856 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 8 Jun 2010 15:48:02 -0700
Subject: Fixed radar spam regression

---
 linden/indra/newview/panelradar.cpp      |  6 +++---
 linden/indra/newview/panelradarentry.cpp | 26 ++++++++++----------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/linden/indra/newview/panelradar.cpp b/linden/indra/newview/panelradar.cpp
index 85048fe..9b4c5b4 100644
--- a/linden/indra/newview/panelradar.cpp
+++ b/linden/indra/newview/panelradar.cpp
@@ -261,9 +261,9 @@ void PanelRadar::updateRadarDisplay()
 					}
 				}
 			}
-			if (notify_chat && 
-				(entry->getDistance() < chat_distance) && 
-				(entry->getNotified() < RADAR_NOTIFIED_CHAT))
+			else if (notify_chat && 
+					(entry->getDistance() < chat_distance) && 
+					(entry->getNotified() < RADAR_NOTIFIED_CHAT))
 			{
 				LLChat chat;
 				LLUIString notify = getString("entering_chat_range");
diff --git a/linden/indra/newview/panelradarentry.cpp b/linden/indra/newview/panelradarentry.cpp
index 8accd29..c0773ae 100644
--- a/linden/indra/newview/panelradarentry.cpp
+++ b/linden/indra/newview/panelradarentry.cpp
@@ -60,26 +60,20 @@ void PanelRadarEntry::setPosition(const LLVector3d& position)
 
 void PanelRadarEntry::setStatus(const RADAR_STATUS& status)
 {
-	if (status <= RADAR_STATUS_AWAY)
-	{
-		mStatus = status;
+	mStatus = status;
 
-		if (mStatus != RADAR_STATUS_NONE || mStatusTimer.hasExpired())
-		{
-			mStatusTimer.start();
-			mStatusTimer.setTimerExpirySec(RADAR_STATUS_TIMEOUT);
-		}
-		else
-		{
-			mStatusTimer.stop();
-		}
+	if (mStatus != RADAR_STATUS_NONE || mStatusTimer.hasExpired())
+	{
+		mStatusTimer.start();
+		mStatusTimer.setTimerExpirySec(RADAR_STATUS_TIMEOUT);
+	}
+	else
+	{
+		mStatusTimer.stop();
 	}
 }
 
 void PanelRadarEntry::setNotified(const RADAR_NOTIFIED& notified)
 {
-	if (notified <= RADAR_NOTIFIED_SIM)
-	{
-		mNotified = notified;
-	}
+	mNotified = notified;
 }
-- 
cgit v1.1