From c2a456e9f2d92a62551cfbd1367c9a0303a1570d Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 15 Jul 2013 11:41:47 -0700 Subject: BUILDFIX: remove ambiguity of is_approx_equal, use llabs instead of fabs --- indra/llui/llstatbar.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/llui') diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp index a0a14f4610..3cd60a3f73 100755 --- a/indra/llui/llstatbar.cpp +++ b/indra/llui/llstatbar.cpp @@ -80,12 +80,12 @@ void calc_auto_scale_range(F32& min, F32& max, F32& tick) const F32 RANGES[] = {0.f, 1.f, 1.5f, 2.f, 3.f, 5.f, 10.f}; const F32 TICKS[] = {0.f, 0.25f, 0.5f, 1.f, 1.f, 1.f, 2.f }; - const S32 num_digits_max = is_approx_equal(fabs(max), 0.f) + const S32 num_digits_max = is_approx_equal(llabs(max), 0.f) ? S32_MIN + 1 - : llceil(logf(fabs(max)) * OO_LN10); - const S32 num_digits_min = is_approx_equal(fabs(min), 0.f) + : llceil(logf(llabs(max)) * OO_LN10); + const S32 num_digits_min = is_approx_equal(llabs(min), 0.f) ? S32_MIN + 1 - : llceil(logf(fabs(min)) * OO_LN10); + : llceil(logf(llabs(min)) * OO_LN10); const S32 num_digits = llmax(num_digits_max, num_digits_min); const F32 power_of_10 = pow(10.0, num_digits - 1); -- cgit v1.2.3