diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-17 13:37:28 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-17 13:37:28 -0500 |
| commit | 0915ce7834f8e36c53e0790c2946b952a12a74c6 (patch) | |
| tree | 270a7d6d12e444d739b85ad9d89e0001621b20a2 /indra/llcommon/llworkerthread.h | |
| parent | 613d0fe42ff94064a7fabeff28845a9406ea9b9c (diff) | |
| parent | 6157386b4c96740e406a49eb9e8f42c6d7f252ff (diff) | |
reconciled .hgtags
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); |