diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-16 13:08:06 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-16 13:08:06 -0400 |
| commit | 31f3db02919870a8e92c9452de477c1478b273e9 (patch) | |
| tree | 1acf6944bf8dbe0b67bb64caee9188ad5e36d913 /indra/newview/llworld.cpp | |
| parent | 0b996159cef3a4022c6a3d4691bd2e2db37b6e92 (diff) | |
| parent | 9197a8652e49178c63ea208c6c4acf1ca3433659 (diff) | |
merge changes for DRTVWR-417
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 5d657f7eef..11d3706821 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -1281,7 +1281,7 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi { LLVOAvatar* pVOAvatar = (LLVOAvatar*) *iter; - if (!pVOAvatar->isDead() && !pVOAvatar->mIsDummy) + if (!pVOAvatar->isDead() && !pVOAvatar->mIsDummy && !pVOAvatar->isOrphaned()) { LLVector3d pos_global = pVOAvatar->getPositionGlobal(); LLUUID uuid = pVOAvatar->getID(); |