merge fix

master
Brad Payne (Vir Linden) 2014-05-16 15:47:34 -04:00
parent 7f3e1b7313
commit a5bb8839fa
1 changed files with 1 additions and 1 deletions

View File

@ -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;
}