Skip to content
Snippets Groups Projects
Commit 21f3634d authored by Jonathan Yap's avatar Jonathan Yap
Browse files

STORM-1793 Fix dumb syntax error

parent acb1df8b
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
indra/newview/llworld.cpp
+ 10
− 11
View file @ 21f3634d
...@@ -1190,9 +1190,9 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi ...@@ -1190,9 +1190,9 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi
LLVOAvatar* pVOAvatar = (LLVOAvatar*) *iter; LLVOAvatar* pVOAvatar = (LLVOAvatar*) *iter;
LLVector3d pos_global = pVOAvatar->getPositionGlobal(); LLVector3d pos_global = pVOAvatar->getPositionGlobal();
LLUUID uuid = pVOAvatar->getID(); LLUUID uuid = pVOAvatar->getID();
if( !pVOAvatar->isDead() && if( !pVOAvatar->isDead()
!pVOAvatar->isSelf() && && !pVOAvatar->isSelf()
!uuid.isNull() && && !uuid.isNull() &&
dist_vec_squared(pos_global, relative_to) <= radius_squared) dist_vec_squared(pos_global, relative_to) <= radius_squared)
{ {
if(positions != NULL) if(positions != NULL)
...@@ -1205,7 +1205,6 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi ...@@ -1205,7 +1205,6 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi
} }
} }
} }
}
// region avatars added for situations where radius is greater than RenderFarClip // region avatars added for situations where radius is greater than RenderFarClip
for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
iter != LLWorld::getInstance()->getRegionList().end(); ++iter) iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment