diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2022-09-09 06:36:00 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2022-09-09 06:36:00 -0700 |
| commit | 0fdef555ba5e0dc8e1e1bd8f2db0543d59bc318a (patch) | |
| tree | d0d075cf0b24a181fe7dbc00ac36ffc3e2d9394e /indra/llcommon | |
| parent | c94a521c6ab4f6c42c61087df78252930e7865a3 (diff) | |
| parent | 8fb18e9a5d1f42fa86ca1cc2a4306edccb7065c5 (diff) | |
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llworkerthread.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp index 02ce4823b8..bd2eb2089c 100644 --- a/indra/llcommon/llworkerthread.cpp +++ b/indra/llcommon/llworkerthread.cpp @@ -97,6 +97,7 @@ S32 LLWorkerThread::update(F32 max_time_ms) { if (worker->getFlags(LLWorkerClass::WCF_WORK_FINISHED)) { + worker->setFlags(LLWorkerClass::WCF_DELETE_REQUESTED); delete_list.push_back(worker); mDeleteList.erase(curiter); } |