diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-12-05 17:56:38 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-12-05 17:56:38 -0600 |
| commit | 1516e4c4971152273dc4f1055eaaae117419a8f6 (patch) | |
| tree | c7c2c9265897974e80aca2cfb56319cb9f744515 /indra/llcommon/llqueuedthread.cpp | |
| parent | 66c72be939012ddacdf0831f380e758569172b15 (diff) | |
| parent | 78233d1bf9930575ee7250257ac68603f41f568a (diff) | |
merge
Diffstat (limited to 'indra/llcommon/llqueuedthread.cpp')
| -rw-r--r-- | indra/llcommon/llqueuedthread.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp index 5dee7a3541..1738c16dea 100644 --- a/indra/llcommon/llqueuedthread.cpp +++ b/indra/llcommon/llqueuedthread.cpp @@ -109,7 +109,7 @@ void LLQueuedThread::shutdown() // MAIN THREAD // virtual -S32 LLQueuedThread::update(U32 max_time_ms) +S32 LLQueuedThread::update(F32 max_time_ms) { if (!mStarted) { @@ -122,7 +122,7 @@ S32 LLQueuedThread::update(U32 max_time_ms) return updateQueue(max_time_ms); } -S32 LLQueuedThread::updateQueue(U32 max_time_ms) +S32 LLQueuedThread::updateQueue(F32 max_time_ms) { F64 max_time = (F64)max_time_ms * .001; LLTimer timer; |