diff options
| author | Richard Linden <none@none> | 2012-01-18 13:36:16 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-18 13:36:16 -0800 |
| commit | a1b200878fdc517252506a19f71432ab956086c2 (patch) | |
| tree | 627d180f48cc8dca01f9144da39b2fa6fbd84979 /indra/llcommon/llqueuedthread.cpp | |
| parent | 41a43a4125a69835e6a76f5792a267ba0797f41a (diff) | |
| parent | b1d28300fbd37edfb4093b13ea0d243e45d6952b (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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; |