diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-09-23 19:45:58 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-09-23 19:45:58 +0300 |
| commit | 21fdf0485fc4198ef6b159afb6577cbd31687fc4 (patch) | |
| tree | 207944f628ffee632c67561f11f2f65a202c78dd /indra | |
| parent | 2412725293b1715c596395e62b3da341e15b69ac (diff) | |
MAINT-6747 eliminating convertion error
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmath/llmath.h | 5 | ||||
| -rw-r--r-- | indra/llui/llspinctrl.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h index 93b9f22b25..692284e04b 100644 --- a/indra/llmath/llmath.h +++ b/indra/llmath/llmath.h @@ -254,6 +254,11 @@ inline int round_int(double x) } #endif // BOGUS_ROUND +inline F64 ll_round(const F64 val) +{ + return F64(floor(val + 0.5f)); +} + inline F32 ll_round( F32 val, F32 nearest ) { return F32(floor(val * (1.0f / nearest) + 0.5f)) * nearest; diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp index 8b1ba406c8..d49e216898 100644 --- a/indra/llui/llspinctrl.cpp +++ b/indra/llui/llspinctrl.cpp @@ -153,7 +153,7 @@ F32 clamp_precision(F32 value, S32 decimal_precision) for (S32 i = 0; i < decimal_precision; i++) clamped_value *= 10.0; - clamped_value = ll_round((F32)clamped_value); + clamped_value = ll_round(clamped_value); for (S32 i = 0; i < decimal_precision; i++) clamped_value /= 10.0; |