From 21f3634d29fda4ea39537102bfdcc29c37e718ba Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 6 Feb 2012 18:00:18 -0500
Subject: [PATCH] STORM-1793 Fix dumb syntax error
---
indra/newview/llworld.cpp | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 5b2e78477c7..fbd8b3ada39 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);
}
}
}
--
GitLab