diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-07 02:48:44 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-07 02:48:44 +0000 |
| commit | 068558f888446691ebbb3df2105948e0d50300a5 (patch) | |
| tree | 5224e0fa3e627bc9018af9660198ef15b19c5487 /indra/llui | |
| parent | c4059553afa289f51f9966b4283b2a62b7103303 (diff) | |
merge release@58791 vc8@58828 -> release
Adds Dev Studio 2005 (VC8)
Reviewed by Rob
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llsliderctrl.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/llspinctrl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llsliderctrl.cpp b/indra/llui/llsliderctrl.cpp index 6c740aa39e..3079726434 100644 --- a/indra/llui/llsliderctrl.cpp +++ b/indra/llui/llsliderctrl.cpp @@ -196,7 +196,7 @@ void LLSliderCtrl::updateText() LLLocale locale(LLLocale::USER_LOCALE); // Don't display very small negative values as -0.000 - F32 displayed_value = (F32)(floor(getValueF32() * pow(10, mPrecision) + 0.5) / pow(10, mPrecision)); + F32 displayed_value = (F32)(floor(getValueF32() * pow(10.0, (F64)mPrecision) + 0.5) / pow(10.0, (F64)mPrecision)); LLString format = llformat("%%.%df", mPrecision); LLString text = llformat(format.c_str(), displayed_value); diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp index 332372011e..4c1700175b 100644 --- a/indra/llui/llspinctrl.cpp +++ b/indra/llui/llspinctrl.cpp @@ -229,7 +229,7 @@ void LLSpinCtrl::updateEditor() LLLocale locale(LLLocale::USER_LOCALE); // Don't display very small negative values as -0.000 - F32 displayed_value = (F32)floor(getValue().asReal() * pow(10, mPrecision) + 0.5) / (F32)pow(10, mPrecision); + F32 displayed_value = (F32)floor(getValue().asReal() * pow(10.0, (F64)mPrecision) + 0.5) / (F32)pow(10.0, (F64)mPrecision); // if( S32( displayed_value * pow( 10, mPrecision ) ) == 0 ) // { |