diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-16 08:19:49 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-16 08:19:49 -0400 |
commit | bf96c7f67e623b09f83b2300e7b82cb04dce1ee3 (patch) | |
tree | 3d3ff515c4055877d2f1158287ddaf9dd5107a13 /indra/llcommon/llworkerthread.h | |
parent | 76a54429fef78bb36ef5d4189e78867a7002f058 (diff) | |
parent | 4924f0c99b021869967f4587df703084d2bdc8ed (diff) |
merge
Diffstat (limited to 'indra/llcommon/llworkerthread.h')
-rw-r--r-- | indra/llcommon/llworkerthread.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llworkerthread.h b/indra/llcommon/llworkerthread.h index 973b78ca01..78a4781d15 100644 --- a/indra/llcommon/llworkerthread.h +++ b/indra/llcommon/llworkerthread.h @@ -94,6 +94,7 @@ public: private: void deleteWorker(LLWorkerClass* workerclass); // schedule for deletion + }; //============================================================================ @@ -193,7 +194,7 @@ protected: U32 mRequestPriority; // last priority set private: - LLMutexRootPool mMutex; // Use LLMutexRootPool since this object is created and destructed by multiple threads. + LLMutex mMutex; LLAtomicU32 mWorkFlags; }; |