diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-17 14:28:58 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-17 14:28:58 -0500 |
| commit | 4666497507b2489004a4ebcf77c0e33723291bcd (patch) | |
| tree | 677050cb13533b17e2c5e170a8438aef221b85ca /indra/llui/lltimectrl.cpp | |
| parent | 11ecd9a2d97f2daeba932bcda557d3ae17956ed8 (diff) | |
| parent | f8ed44f8ec80916e684c2783da02f89474710de6 (diff) | |
merge up to latest changes from callum and nat
Diffstat (limited to 'indra/llui/lltimectrl.cpp')
| -rwxr-xr-x | indra/llui/lltimectrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltimectrl.cpp b/indra/llui/lltimectrl.cpp index 271947db7a..516057f8fd 100755 --- a/indra/llui/lltimectrl.cpp +++ b/indra/llui/lltimectrl.cpp @@ -153,7 +153,7 @@ U32 LLTimeCtrl::getMinutes() const void LLTimeCtrl::setTime24(F32 time) { time = llclamp(time, 0.0f, 23.99f); // fix out of range values - mTime = llround(time * MINUTES_PER_HOUR); // fixes values like 4.99999 + mTime = ll_round(time * MINUTES_PER_HOUR); // fixes values like 4.99999 updateText(); } |