summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-06-22 14:59:40 -0500
committerDave Parks <davep@lindenlab.com>2012-06-22 14:59:40 -0500
commit667e5d196817dffa7eb68ec53dd02ac7a66d0ea2 (patch)
treed81607c82abc142d0b747f8dd64dd1d0509bbdb4 /indra/newview/llworld.cpp
parent9e9d32de384b2807f195be48f49fbdec725f45d1 (diff)
Merge cleanup
Diffstat (limited to 'indra/newview/llworld.cpp')
-rw-r--r--indra/newview/llworld.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index fc6b959aa8..b061c90d98 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -1195,7 +1195,6 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi
if (!uuid.isNull()
&& dist_vec_squared(pos_global, relative_to) <= radius_squared)
- dist_vec_squared(pos_global, relative_to) <= radius_squared)
{
if(positions != NULL)
{