diff options
| author | Richard@Callum-HP-PC.lindenlab.com <Richard@Callum-HP-PC.lindenlab.com> | 2011-10-21 14:41:24 -0700 |
|---|---|---|
| committer | Richard@Callum-HP-PC.lindenlab.com <Richard@Callum-HP-PC.lindenlab.com> | 2011-10-21 14:41:24 -0700 |
| commit | f5197b6158bf1b9350fab2dd7877f6c0a4c2f778 (patch) | |
| tree | ff9c621341b9076fff8a11b66befa6e37183f286 /indra/llcommon/llworkerthread.h | |
| parent | f2952ded0396e98e1010ebe39de5bba0ae6ba5f7 (diff) | |
| parent | 255eebf11615a1a8c47003ee24b1696b8ae63e23 (diff) | |
merge with viewer-dev
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; }; |