diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-12-19 06:00:48 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-12-19 06:00:48 -0800 |
| commit | b0f590f6ab4033503ff9d80e2374e374397d40fb (patch) | |
| tree | 97e9758c011105b48218cbd2e611c51cc967520d /indra/llui/llstatbar.cpp | |
| parent | d0d5a6a15cf3c573c89ce590030c7a150b19dd05 (diff) | |
| parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) | |
Pull merge from lindenlab/viewer-release
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)); |