diff options
author | Merov Linden <merov@lindenlab.com> | 2012-01-18 14:24:58 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-01-18 14:24:58 -0800 |
commit | 6ee627d4c065f3c5aedba4765823a65255679f09 (patch) | |
tree | 90c43334f5966e792cd9b9438ba2beb60623c43d /indra/llcommon/llworkerthread.h | |
parent | 07294e04983c6c24ec8cd5d589c4a0a8fda87431 (diff) | |
parent | a1b200878fdc517252506a19f71432ab956086c2 (diff) |
Pull from viewer-experience
Diffstat (limited to 'indra/llcommon/llworkerthread.h')
-rw-r--r-- | indra/llcommon/llworkerthread.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llworkerthread.h b/indra/llcommon/llworkerthread.h index 78a4781d15..be46394d6e 100644 --- a/indra/llcommon/llworkerthread.h +++ b/indra/llcommon/llworkerthread.h @@ -86,7 +86,7 @@ public: LLWorkerThread(const std::string& name, bool threaded = true, bool should_pause = false); ~LLWorkerThread(); - /*virtual*/ S32 update(U32 max_time_ms); + /*virtual*/ S32 update(F32 max_time_ms); handle_t addWorkRequest(LLWorkerClass* workerclass, S32 param, U32 priority = PRIORITY_NORMAL); |