Robin Cornelius, Aleric Inglewood: SNOW-196 missing mutexes for texture fetch

Applys a trylock() abort system to allow the worker thread to avoid deadlocks
due to a race between mQueueMutex and mWorkerMutex.

1 files changed, 2 insertions, 1 deletions

diff --git a/linden/indra/llcommon/llthread.h b/linden/indra/llcommon/llthread.h
index 721b6e7..d773fa4 100644
--- a/linden/indra/llcommon/llthread.h
+++ b/linden/indra/llcommon/llthread.h
@@ -134,7 +134,8 @@ public:
         void lock();            // blocks
         void unlock();
         bool isLocked();        // non-blocking, but does do a lock/unlock so not free
-        
+        bool tryLock();         //non-blocking, but not free, returns true if grabed lock
+
 protected:
         apr_thread_mutex_t *mAPRMutexp;
         apr_pool_t                      *mAPRPoolp;