diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-10-27 16:16:57 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-10-27 16:16:57 -0700 |
| commit | a09df4f840fc841870da76e904efec51d3e304b4 (patch) | |
| tree | 12b434f44c4088865d9449a52c1c7648d5adacd4 /indra/llcommon/llworkerthread.h | |
| parent | 988278d236d789f490eed24a662a6ffe2be6455a (diff) | |
| parent | ad4ae99c30f1293bf8266c1f53ae62161bcb68bb (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; }; |