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.h | |
| parent | 66c72be939012ddacdf0831f380e758569172b15 (diff) | |
| parent | 78233d1bf9930575ee7250257ac68603f41f568a (diff) | |
merge
Diffstat (limited to 'indra/llcommon/llqueuedthread.h')
| -rw-r--r-- | indra/llcommon/llqueuedthread.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llqueuedthread.h b/indra/llcommon/llqueuedthread.h index 499d13a792..d3704b0fe2 100644 --- a/indra/llcommon/llqueuedthread.h +++ b/indra/llcommon/llqueuedthread.h @@ -173,8 +173,8 @@ protected: public: bool waitForResult(handle_t handle, bool auto_complete = true); - virtual S32 update(U32 max_time_ms); - S32 updateQueue(U32 max_time_ms); + virtual S32 update(F32 max_time_ms); + S32 updateQueue(F32 max_time_ms); void waitOnPending(); void printQueueStats(); |