livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unneeded data from RadarFields struct

master
Ansariel 2013-04-22 11:29:13 +02:00
parent 5bfbdaf8ad
commit f238ec7c43
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/fsradar.cpp
View File

@ -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;
}

6
indra/newview/fsradar.h
View File

@ -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;