summaryrefslogtreecommitdiff
path: root/indra/llcommon/llworkerthread.h
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-09-21 16:04:12 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-09-21 16:04:12 -0400
commit8665dee5f6cca501ec94b33e56c0c4de284fd757 (patch)
tree9a3356ac50a7fa084c698092596c6ba3cba59423 /indra/llcommon/llworkerthread.h
parenta66b5fb8cfc590110bb698d490510d66b6d8b430 (diff)
parent2ae5e8db53e6d89e741cda0ce45e8cf65595bd16 (diff)
reconciled .hgtags
Diffstat (limited to 'indra/llcommon/llworkerthread.h')
-rw-r--r--indra/llcommon/llworkerthread.h3
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;
};