diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-02-07 09:25:57 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-02-07 09:25:57 -0500 |
| commit | 3013160846d66d4c7b3f05a550635d5426aca2e8 (patch) | |
| tree | 2fd157aee004d47b47ea7b3b02d16982d29aa7fa /indra/newview | |
| parent | d3cbcc58ef0c8cff0e744b37b83055ec3b48d9e2 (diff) | |
| parent | 21f3634d29fda4ea39537102bfdcc29c37e718ba (diff) | |
merge changes for storm-1793
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llworld.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 5b2e78477c..fbd8b3ada3 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -1190,19 +1190,18 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi LLVOAvatar* pVOAvatar = (LLVOAvatar*) *iter; LLVector3d pos_global = pVOAvatar->getPositionGlobal(); LLUUID uuid = pVOAvatar->getID(); - if( !pVOAvatar->isDead() && - !pVOAvatar->isSelf() && - !uuid.isNull() && + if( !pVOAvatar->isDead() + && !pVOAvatar->isSelf() + && !uuid.isNull() && dist_vec_squared(pos_global, relative_to) <= radius_squared) + { + if(positions != NULL) { - if(positions != NULL) - { - positions->push_back(pos_global); - } - if(avatar_ids !=NULL) - { - avatar_ids->push_back(uuid); - } + positions->push_back(pos_global); + } + if(avatar_ids !=NULL) + { + avatar_ids->push_back(uuid); } } } |