diff options
author | Oz Linden <oz@lindenlab.com> | 2012-01-13 09:58:47 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-01-13 09:58:47 -0500 |
commit | f6b8bfd3da163d275400035b24a969e5147c6352 (patch) | |
tree | 449fda9ad8f4628e0b1dfac31068a9a5d943a7af /indra/llcommon/llqueuedthread.cpp | |
parent | 6aa48f31c9af1f46335aa64648cda77912aa391d (diff) | |
parent | 4405910caa34446a19f66cfc35a9270a0e14292f (diff) |
merge changes for vmrg-215
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; |