summaryrefslogtreecommitdiff
path: root/indra/llcommon/llworkerthread.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-01-18 14:24:58 -0800
committerMerov Linden <merov@lindenlab.com>2012-01-18 14:24:58 -0800
commit6ee627d4c065f3c5aedba4765823a65255679f09 (patch)
tree90c43334f5966e792cd9b9438ba2beb60623c43d /indra/llcommon/llworkerthread.cpp
parent07294e04983c6c24ec8cd5d589c4a0a8fda87431 (diff)
parenta1b200878fdc517252506a19f71432ab956086c2 (diff)
Pull from viewer-experience
Diffstat (limited to 'indra/llcommon/llworkerthread.cpp')
-rw-r--r--indra/llcommon/llworkerthread.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp
index 4988bdf570..3d05a30ac2 100644
--- a/indra/llcommon/llworkerthread.cpp
+++ b/indra/llcommon/llworkerthread.cpp
@@ -81,7 +81,7 @@ void LLWorkerThread::clearDeleteList()
}
// virtual
-S32 LLWorkerThread::update(U32 max_time_ms)
+S32 LLWorkerThread::update(F32 max_time_ms)
{
S32 res = LLQueuedThread::update(max_time_ms);
// Delete scheduled workers