diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-02-07 13:11:39 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-02-07 13:11:39 -0500 |
| commit | 3bcd4f4608a7ce33b61c6978544096436dea4e53 (patch) | |
| tree | 6ef7168a6ec646c023d2f4badc9a0960d20eea3e /indra/llcommon/llqueuedthread.cpp | |
| parent | 33a42b32ca72031a79edca821966f6ebbdcddc93 (diff) | |
| parent | 5e367f0d9de593c45683f7c640024a378bb03919 (diff) | |
Merge daggy fix at r32811ea374ab to tip
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; |