Updated lltexturecache to the latest in viewer-development (see #425)

2 files changed, 44 insertions, 3 deletions

diff --git a/linden/indra/llcommon/llworkerthread.cpp b/linden/indra/llcommon/llworkerthread.cpp
index 8195e1c..67664c7 100644
--- a/linden/indra/llcommon/llworkerthread.cpp
+++ b/linden/indra/llcommon/llworkerthread.cpp
@@ -60,6 +60,27 @@ LLWorkerThread::~LLWorkerThread()
         // ~LLQueuedThread() will be called here
 }
 
+//called only in destructor.
+void LLWorkerThread::clearDeleteList()
+{
+        // Delete any workers in the delete queue (should be safe - had better be!)
+        if (!mDeleteList.empty())
+        {
+                llwarns << "Worker Thread: " << mName << " destroyed with " << mDeleteList.size()
+                                << " entries in delete list." << llendl;
+
+                mDeleteMutex->lock();
+                for (delete_list_t::iterator iter = mDeleteList.begin(); iter != mDeleteList.end(); ++iter)
+                {
+                        (*iter)->mRequestHandle = LLWorkerThread::nullHandle();
+                        (*iter)->clearFlags(LLWorkerClass::WCF_HAVE_WORK);
+                        delete *iter ;
+                }
+                mDeleteList.clear() ;
+                mDeleteMutex->unlock() ;
+        }
+}
+
 // virtual
 S32 LLWorkerThread::update(U32 max_time_ms)
 {
@@ -183,6 +204,7 @@ LLWorkerClass::LLWorkerClass(LLWorkerThread* workerthread, const std::string& na
         : mWorkerThread(workerthread),
           mWorkerClassName(name),
           mRequestHandle(LLWorkerThread::nullHandle()),
+          mRequestPriority(LLWorkerThread::PRIORITY_NORMAL),
           mMutex(NULL),
           mWorkFlags(0)
 {
@@ -314,7 +336,20 @@ bool LLWorkerClass::checkWork(bool aborting)
         if (mRequestHandle != LLWorkerThread::nullHandle())
         {
                 LLWorkerThread::WorkRequest* workreq = (LLWorkerThread::WorkRequest*)mWorkerThread->getRequest(mRequestHandle);
-                llassert_always(workreq);
+                if(!workreq)
+                {
+                        if(mWorkerThread->isQuitting() || mWorkerThread->isStopped()) //the mWorkerThread is not running
+                        {
+                                mRequestHandle = LLWorkerThread::nullHandle();
+                                clearFlags(WCF_HAVE_WORK);
+                        }
+                        else
+                        {
+                                llassert_always(workreq);
+                        }
+                        return true ;
+                }
+
                 LLQueuedThread::status_t status = workreq->getStatus();
                 if (status == LLWorkerThread::STATUS_ABORTED)
                 {
@@ -364,7 +399,7 @@ void LLWorkerClass::scheduleDelete()
 void LLWorkerClass::setPriority(U32 priority)
 {
         mMutex.lock();
-        if (mRequestHandle != LLWorkerThread::nullHandle())
+        if (mRequestHandle != LLWorkerThread::nullHandle() && mRequestPriority != priority)
         {
                 mRequestPriority = priority;
                 mWorkerThread->setPriority(mRequestHandle, priority);
diff --git a/linden/indra/llcommon/llworkerthread.h b/linden/indra/llcommon/llworkerthread.h
index 708d812..d1868bc 100644
--- a/linden/indra/llcommon/llworkerthread.h
+++ b/linden/indra/llcommon/llworkerthread.h
@@ -80,6 +80,9 @@ public:
                 S32 mParam;
         };
 
+protected:
+        void clearDeleteList() ;
+
 private:
         typedef std::list<LLWorkerClass*> delete_list_t;
         delete_list_t mDeleteList;
@@ -93,8 +96,11 @@ public:
         
         handle_t addWorkRequest(LLWorkerClass* workerclass, S32 param, U32 priority = PRIORITY_NORMAL);
         
-        void deleteWorker(LLWorkerClass* workerclass); // schedule for deletion
         S32 getNumDeletes() { return (S32)mDeleteList.size(); } // debug
+
+private:
+        void deleteWorker(LLWorkerClass* workerclass); // schedule for deletion
+        
 };
 
 //============================================================================