diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-05-19 17:38:06 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-05-19 17:38:06 -0400 |
| commit | 041005f2860808bb807483775635abcd8c54fecf (patch) | |
| tree | 57cce285218550dd2c0378ac8bf0c1c1d856701e /indra/llcommon/llworkerthread.cpp | |
| parent | 1be9d68468e51be7de5b632f0276dc6708e75dc6 (diff) | |
| parent | b61ea595b5f2cac0f108b05526f0a371f512bfd4 (diff) | |
SL-18330: Merge branch 'xcode-14.3' into fix-monterey
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; |