diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-27 21:02:01 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-27 21:02:01 +0000 |
| commit | 926ea0b39afd04cab469ca17b28f95ebf969e669 (patch) | |
| tree | 40d5653e19160f72e7a0b80fadb9bdb93ef3575c /indra/llcommon/llworkerthread.cpp | |
| parent | 41877d457ab9542dca22b99f3eddb1bfcfe7c1d6 (diff) | |
QAR-669 1.20 Viewer RC11
QAR-648 1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
Diffstat (limited to 'indra/llcommon/llworkerthread.cpp')
| -rw-r--r-- | indra/llcommon/llworkerthread.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp index d828ed9468..f3be5a2690 100644 --- a/indra/llcommon/llworkerthread.cpp +++ b/indra/llcommon/llworkerthread.cpp @@ -36,6 +36,7 @@ #include "llframecallbackmanager.h" #endif +BOOL LLWorkerClass::sDeleteLock = FALSE ; //============================================================================ // Run on MAIN thread @@ -94,6 +95,7 @@ S32 LLWorkerThread::update(U32 max_time_ms) { (*iter)->abortWork(false); } + LLWorkerClass::sDeleteLock = TRUE ; for (std::vector<LLWorkerClass*>::iterator iter = delete_list.begin(); iter != delete_list.end(); ++iter) { @@ -107,6 +109,7 @@ S32 LLWorkerThread::update(U32 max_time_ms) } delete *iter; } + LLWorkerClass::sDeleteLock = FALSE ; // delete and aborted entries mean there's still work to do res += delete_list.size() + abort_list.size(); return res; |