diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-05-16 15:47:34 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-05-16 15:47:34 -0400 |
| commit | a5bb8839fa24fa0b7da331f14eedccea1b44bc84 (patch) | |
| tree | 6965c0a7bf07afe6ae50b053c52bb752b3d00515 /indra/newview | |
| parent | 7f3e1b73137d51e27075c6a71c25c4eafd6cb21c (diff) | |
merge fix
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llhttpretrypolicy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llhttpretrypolicy.cpp b/indra/newview/llhttpretrypolicy.cpp index 7001a9a88b..2d4ce6c883 100755 --- a/indra/newview/llhttpretrypolicy.cpp +++ b/indra/newview/llhttpretrypolicy.cpp @@ -137,6 +137,6 @@ bool LLAdaptiveRetryPolicy::shouldRetry(F32& seconds_to_wait) const seconds_to_wait = F32_MAX; return false; } - seconds_to_wait = mShouldRetry ? mRetryTimer.getRemainingTimeF32() : F32_MAX; + seconds_to_wait = mShouldRetry ? (F32) mRetryTimer.getRemainingTimeF32() : F32_MAX; return mShouldRetry; } |