diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-04 09:38:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-04 09:38:29 -0400 |
| commit | 383fccbd57ef273aa803497ad87cf9badc5db90a (patch) | |
| tree | ab042292d129a92092b35accde69eb57a3565389 /indra/newview/llworld.cpp | |
| parent | f5bb046c5d3d393352b5b90424837a3d213dfbb9 (diff) | |
| parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) | |
merge changes for viewer-development before mesh merge
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 6b2af1f8b7..8f50041474 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -1438,6 +1438,8 @@ static LLVector3d unpackLocalToGlobalPosition(U32 compact_local, const LLVector3 void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positions, const LLVector3d& relative_to, F32 radius) const { + F32 radius_squared = radius * radius; + if(avatar_ids != NULL) { avatar_ids->clear(); @@ -1458,7 +1460,7 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi if(!uuid.isNull()) { LLVector3d pos_global = pVOAvatar->getPositionGlobal(); - if(dist_vec(pos_global, relative_to) <= radius) + if(dist_vec_squared(pos_global, relative_to) <= radius_squared) { if(positions != NULL) { @@ -1482,7 +1484,7 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi for (S32 i = 0; i < count; i++) { LLVector3d pos_global = unpackLocalToGlobalPosition(regionp->mMapAvatars.get(i), origin_global); - if(dist_vec(pos_global, relative_to) <= radius) + if(dist_vec_squared(pos_global, relative_to) <= radius_squared) { LLUUID uuid = regionp->mMapAvatarIDs.get(i); // if this avatar doesn't already exist in the list, add it |