diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-08 10:10:59 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-08 10:10:59 -0500 |
| commit | a7f02a3e51f07c657a0acd31637f46f74b30daf7 (patch) | |
| tree | c572c162ee7bec027971ca7a64f74032938b20a8 /indra/newview/llworld.cpp | |
| parent | cce59647a99648af63c96168c36e85563da40a1a (diff) | |
| parent | 55b2383f51ffabf7e95595df5d576f383d458ee1 (diff) | |
merge changes for 3.5.0-beta2
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 09d17b3701..793becf0c8 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -1192,7 +1192,7 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi { LLVOAvatar* pVOAvatar = (LLVOAvatar*) *iter; - if (!pVOAvatar->isDead() && !pVOAvatar->isSelf() && !pVOAvatar->mIsDummy) + if (!pVOAvatar->isDead() && !pVOAvatar->mIsDummy) { LLVector3d pos_global = pVOAvatar->getPositionGlobal(); LLUUID uuid = pVOAvatar->getID(); |