Revert "Updated lltexturecache to the latest in viewer-development (see #425)" since it was causing issues with local assets and object backup

This reverts commit 4ca4594ec264f390be981568ef5ff3ff0f2f77e6.

1 files changed, 2 insertions, 37 deletions

diff --git a/linden/indra/llcommon/llworkerthread.cpp b/linden/indra/llcommon/llworkerthread.cpp
index 67664c7..8195e1c 100644
--- a/linden/indra/llcommon/llworkerthread.cpp
+++ b/linden/indra/llcommon/llworkerthread.cpp
@@ -60,27 +60,6 @@ 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)
 {
@@ -204,7 +183,6 @@ LLWorkerClass::LLWorkerClass(LLWorkerThread* workerthread, const std::string& na
         : mWorkerThread(workerthread),
           mWorkerClassName(name),
           mRequestHandle(LLWorkerThread::nullHandle()),
-          mRequestPriority(LLWorkerThread::PRIORITY_NORMAL),
           mMutex(NULL),
           mWorkFlags(0)
 {
@@ -336,20 +314,7 @@ bool LLWorkerClass::checkWork(bool aborting)
         if (mRequestHandle != LLWorkerThread::nullHandle())
         {
                 LLWorkerThread::WorkRequest* workreq = (LLWorkerThread::WorkRequest*)mWorkerThread->getRequest(mRequestHandle);
-                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 ;
-                }
-
+                llassert_always(workreq);
                 LLQueuedThread::status_t status = workreq->getStatus();
                 if (status == LLWorkerThread::STATUS_ABORTED)
                 {
@@ -399,7 +364,7 @@ void LLWorkerClass::scheduleDelete()
 void LLWorkerClass::setPriority(U32 priority)
 {
         mMutex.lock();
-        if (mRequestHandle != LLWorkerThread::nullHandle() && mRequestPriority != priority)
+        if (mRequestHandle != LLWorkerThread::nullHandle())
         {
                 mRequestPriority = priority;
                 mWorkerThread->setPriority(mRequestHandle, priority);