Second Life viewer sources 1.20.10

1 files changed, 3 insertions, 0 deletions

diff --git a/linden/indra/llcommon/llworkerthread.cpp b/linden/indra/llcommon/llworkerthread.cpp
index 6301fa1..0389cff 100644
--- a/linden/indra/llcommon/llworkerthread.cpp
+++ b/linden/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;