diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-06 09:42:11 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-06 09:42:11 -0400 |
| commit | 08c0de785f29801c57feebce8fae593f86113777 (patch) | |
| tree | 6661b84ca6540f0907b4321f6e49a88be75c2e98 /indra/llcommon/llworkerthread.h | |
| parent | 76f867c8913094573bfa278fc39907d6b0779ec5 (diff) | |
| parent | 0ab6eee0996c78d32b722157140cea5a21a5e460 (diff) | |
merge
Diffstat (limited to 'indra/llcommon/llworkerthread.h')
| -rw-r--r-- | indra/llcommon/llworkerthread.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/llworkerthread.h b/indra/llcommon/llworkerthread.h index 9bff18303e..bef5ef53fe 100644 --- a/indra/llcommon/llworkerthread.h +++ b/indra/llcommon/llworkerthread.h @@ -94,7 +94,6 @@ public: private: void deleteWorker(LLWorkerClass* workerclass); // schedule for deletion - }; //============================================================================ @@ -194,7 +193,7 @@ protected: U32 mRequestPriority; // last priority set private: - LLMutex mMutex; + LLMutexRootPool mMutex; // Use LLMutexRootPool since this object is created and destructed by multiple threads. LLAtomicU32 mWorkFlags; }; |