diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-02-23 13:48:35 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-02-23 13:48:35 -0700 |
| commit | 29415d140777a25704ac06973c6cf467c30c994b (patch) | |
| tree | 8ea879ff5b839b2894e332ed72ff9702784949a0 /indra/llcommon/llworkerthread.h | |
| parent | 1f0cc074823b299ed77b3d6e90e4e8f4ea60415f (diff) | |
| parent | ef490e308ccce8e6df85144784a0f4580f5ac6a1 (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; }; |