diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-01 16:16:11 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-01 16:16:11 -0500 |
| commit | 38a258d04a98939e12bb2cfce6caea288a7fc3a5 (patch) | |
| tree | f221aca4c34189bb1cced52a2edb86cc67314138 /indra/llui/llstatbar.cpp | |
| parent | 1135ba80ec569e20187c36a5364debf9eae8aab7 (diff) | |
| parent | fa9097b65f9d89fd0c8bf7b32924f0327a617cdc (diff) | |
merge
Diffstat (limited to 'indra/llui/llstatbar.cpp')
| -rwxr-xr-x | indra/llui/llstatbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp index 1bd2bc06f4..303417c337 100755 --- a/indra/llui/llstatbar.cpp +++ b/indra/llui/llstatbar.cpp @@ -638,7 +638,7 @@ void LLStatBar::drawLabelAndValue( F32 value, std::string &label, LLRect &bar_re void LLStatBar::drawTicks( F32 min, F32 max, F32 value_scale, LLRect &bar_rect ) { - if (mAutoScaleMax || mAutoScaleMin) + if (!llisnan(min) && (mAutoScaleMax || mAutoScaleMin)) { F32 u = LLSmoothInterpolation::getInterpolant(10.f); mFloatingTargetMinBar = llmin(min, lerp(mFloatingTargetMinBar, min, u)); |