From f238ec7c433982747774caeee637473fbecf1b52 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 22 Apr 2013 11:29:13 +0200
Subject: [PATCH] Remove unneeded data from RadarFields struct

---
 indra/newview/fsradar.cpp | 20 +++-----------------
 indra/newview/fsradar.h   |  6 ------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp
index 8d7642e4fb..7f698c40fe 100644
--- a/indra/newview/fsradar.cpp
+++ b/indra/newview/fsradar.cpp
@@ -704,30 +704,16 @@ void FSRadar::updateRadarList()
 	{
 		FSRadarEntry* ent = em_it->second;
 		RadarFields rf;
-		rf.avName = ent->mName;
 		rf.lastDistance = ent->mRange;
-		rf.firstSeen = ent->mFirstSeen;
-		rf.lastStatus = ent->mStatus;
-		rf.ZOffset = ent->mZOffset;
-		rf.lastGlobalPos = ent->mGlobalPos;
-		// Ansariel: This seems to be wrong and isn't needed anywhere
-		//if ((rf.ZOffset > 0) && (rf.lastGlobalPos[VZ] < 1024)) // if our position may need an offset correction, see if we have one to apply
-		//{
-		//	rf.lastGlobalPos[VZ] = rf.lastGlobalPos[VZ] + (1024 * rf.ZOffset);
-		//}
-		//rf.lastZOffsetTime = ent->mLastZOffsetTime;
-		if (rf.lastGlobalPos != LLVector3d(0.0f, 0.0f, 0.0f))
+		rf.lastRegion = LLUUID::null;
+		if (ent->mGlobalPos != LLVector3d(0.0f, 0.0f, 0.0f))
 		{
-			LLViewerRegion* lastRegion = world->getRegionFromPosGlobal(rf.lastGlobalPos);
+			LLViewerRegion* lastRegion = world->getRegionFromPosGlobal(ent->mGlobalPos);
 			if (lastRegion)
 			{
 				rf.lastRegion = lastRegion->getRegionID();
 			}
 		}
-		else
-		{
-			rf.lastRegion = LLUUID::null;
-		}
 		
 		mLastRadarSweep[ent->mID] = rf;
 	}
diff --git a/indra/newview/fsradar.h b/indra/newview/fsradar.h
index 1516009cfc..6c2e33d300 100644
--- a/indra/newview/fsradar.h
+++ b/indra/newview/fsradar.h
@@ -114,14 +114,8 @@ private:
 	
 	struct RadarFields 
 	{
-		std::string avName;
 		F32			lastDistance;
-		LLVector3d	lastGlobalPos;
 		LLUUID		lastRegion;
-		time_t		firstSeen;
-		S32			lastStatus;
-		U32			ZOffset;
-		time_t		lastZOffsetTime;
 	};
 
 	typedef boost::unordered_map<LLUUID, RadarFields, FSUUIDHash> radarfields_map_t;