Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Radar] Fix the "people not being removed from radar" problem

Browse Source 
We'll now make sure expired avatars are not elsewhere in the world(a different visible region) when we remove them
View without space changes.
This commit is contained in:
Lirusaito
2015-11-26 08:47:15 -05:00
parent ba68d2e231
commit e395d2fdf8
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/llfloateravatarlist.cpp
View File

@@ -509,6 +509,11 @@ void updateParticleActivity(LLDrawable *drawablep)
} }
} }
const F32& radar_range_radius()
{
static const LLCachedControl<F32> radius("RadarRangeRadius", 0);
return radius;
}
void LLFloaterAvatarList::updateAvatarList(const LLViewerRegion* region) void LLFloaterAvatarList::updateAvatarList(const LLViewerRegion* region)
{ {
// Check whether updates are enabled // Check whether updates are enabled
@@ -523,8 +528,7 @@ void LLFloaterAvatarList::updateAvatarList(const LLViewerRegion* region)
const std::vector<LLUUID>& map_avids(region->mMapAvatarIDs); const std::vector<LLUUID>& map_avids(region->mMapAvatarIDs);
const LLVector3d& mypos(gAgent.getPositionGlobal()); const LLVector3d& mypos(gAgent.getPositionGlobal());
const LLVector3d& origin(region->getOriginGlobal()); const LLVector3d& origin(region->getOriginGlobal());
static const LLCachedControl<F32> radar_range_radius("RadarRangeRadius", 0); const F32 max_range(radar_range_radius() * radar_range_radius());
const F32 max_range(radar_range_radius * radar_range_radius);
static LLCachedControl<bool> announce(gSavedSettings, "RadarChatKeys"); static LLCachedControl<bool> announce(gSavedSettings, "RadarChatKeys");
std::queue<LLUUID> announce_keys; std::queue<LLUUID> announce_keys;
@@ -594,14 +598,20 @@ void LLFloaterAvatarList::updateAvatarList(const LLViewerRegion* region)
void LLFloaterAvatarList::expireAvatarList(const std::list<LLUUID>& ids) void LLFloaterAvatarList::expireAvatarList(const std::list<LLUUID>& ids)
{ {
BOOST_FOREACH(const LLUUID& id, ids) if (!ids.empty())
{ {
av_list_t::iterator it(std::find_if(mAvatars.begin(), mAvatars.end(), LLAvatarListEntry::uuidMatch(id))); std::vector<LLUUID> existing_avs;
if (it != mAvatars.end()) LLWorld::instance().getAvatars(&existing_avs, NULL, gAgent.getPositionGlobal(), radar_range_radius());
BOOST_FOREACH(const LLUUID& id, ids)
{ {
LLAvatarListEntry* entry = it->get(); if (std::find(existing_avs.begin(), existing_avs.end(), id) != existing_avs.end()) continue; // Now in another region we know.
entry->setPosition(entry->getPosition(), F32_MIN, false); // Dead and gone av_list_t::iterator it(std::find_if(mAvatars.begin(), mAvatars.end(), id));
mAvatars.erase(it); if (it != mAvatars.end())
{
LLAvatarListEntry* entry = it->get();
entry->setPosition(entry->getPosition(), F32_MIN, false); // Dead and gone
mAvatars.erase(it);
}
} }
} }