livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-1793 Fix dumb syntax error

master
Jonathan Yap 2012-02-06 18:00:18 -05:00
parent acb1df8b85
commit 21f3634d29
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llworld.cpp
View File

@ -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);
}
}
}