diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-12-12 13:27:57 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-12-12 13:27:57 -0500 |
| commit | 12f66fda1376a03a0ef791d22984bd4a13831b5a (patch) | |
| tree | fb1778164030ffdcf84fafb464b80a3845f12500 /indra/llcommon/llworkerthread.cpp | |
| parent | 6de598633355d8867f4de483ab7e2f37a78679c4 (diff) | |
| parent | 2b7ba3f90455d675770e68f7e338d39053a343b9 (diff) | |
DRTVWR-565: Merge branch 'origin/contribute' into DRTVWR-565
Diffstat (limited to 'indra/llcommon/llworkerthread.cpp')
| -rw-r--r-- | indra/llcommon/llworkerthread.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp index 4b91b2caca..97838e296e 100644 --- a/indra/llcommon/llworkerthread.cpp +++ b/indra/llcommon/llworkerthread.cpp @@ -81,9 +81,9 @@ void LLWorkerThread::clearDeleteList() } // virtual -S32 LLWorkerThread::update(F32 max_time_ms) +size_t LLWorkerThread::update(F32 max_time_ms) { - S32 res = LLQueuedThread::update(max_time_ms); + auto res = LLQueuedThread::update(max_time_ms); // Delete scheduled workers std::vector<LLWorkerClass*> delete_list; std::vector<LLWorkerClass*> abort_list; |