summaryrefslogtreecommitdiff
path: root/indra/llmath/llsphere.cpp
diff options
context:
space:
mode:
authorBjoseph Wombat <bjoseph@vivox.com>2015-05-11 14:57:57 +0100
committerBjoseph Wombat <bjoseph@vivox.com>2015-05-11 14:57:57 +0100
commitc6650c13306b0d049ecba02710645b9ca2d90c05 (patch)
tree54932d9221df41ec9c608b70eeb5379fcb1d72c3 /indra/llmath/llsphere.cpp
parent7ec58ee04789a8cc819d1151529d843045651bc8 (diff)
parente611e35e033e99f619b0e4938f6879c8e387efd5 (diff)
updates from bitbucket repository
Diffstat (limited to 'indra/llmath/llsphere.cpp')
-rwxr-xr-xindra/llmath/llsphere.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmath/llsphere.cpp b/indra/llmath/llsphere.cpp
index 740047b93a..a8d6200488 100755
--- a/indra/llmath/llsphere.cpp
+++ b/indra/llmath/llsphere.cpp
@@ -248,8 +248,8 @@ LLSphere LLSphere::getBoundingSphere(const std::vector<LLSphere>& sphere_list)
// compute the starting step-size
F32 minimum_radius = 0.5f * llmin(diagonal.mV[VX], llmin(diagonal.mV[VY], diagonal.mV[VZ]));
F32 step_length = bounding_radius - minimum_radius;
- S32 step_count = 0;
- S32 max_step_count = 12;
+ //S32 step_count = 0;
+ //S32 max_step_count = 12;
F32 half_milimeter = 0.0005f;
// wander the center around in search of tighter solutions
@@ -258,7 +258,7 @@ LLSphere LLSphere::getBoundingSphere(const std::vector<LLSphere>& sphere_list)
S32 last_dz = 2;
while (step_length > half_milimeter
- && step_count < max_step_count)
+ /*&& step_count < max_step_count*/)
{
// the algorithm for testing the maximum radius could be expensive enough
// that it makes sense to NOT duplicate testing when possible, so we keep