diff options
| author | Jonathan Yap <none@none> | 2012-02-06 18:00:18 -0500 | 
|---|---|---|
| committer | Jonathan Yap <none@none> | 2012-02-06 18:00:18 -0500 | 
| commit | 21f3634d29fda4ea39537102bfdcc29c37e718ba (patch) | |
| tree | bdb82b2657e6ee6d6777a1a2d5f91e4ed3a1a18e | |
| parent | acb1df8b856f49b970a5756bbed24cafad127df8 (diff) | |
STORM-1793 Fix dumb syntax error
| -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);  			}  		}  	} | 
