diff options
author | Logan Dethrow <log@lindenlab.com> | 2011-10-12 14:40:49 -0400 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2011-10-12 14:40:49 -0400 |
commit | ad3ffeed867145693500daf903c581b91b1dfcb5 (patch) | |
tree | 43815c43b04b3afe29b54993193b2863949984c3 /indra/llcommon/llworkerthread.cpp | |
parent | 6fae13579eccf64959451a3aab1b77fa2ac02155 (diff) | |
parent | aabdbeadf53b3a20b4db563a23535af74fd7d4b7 (diff) |
Merge
Diffstat (limited to 'indra/llcommon/llworkerthread.cpp')
-rw-r--r-- | indra/llcommon/llworkerthread.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp index 6b308bb917..e186621503 100644 --- a/indra/llcommon/llworkerthread.cpp +++ b/indra/llcommon/llworkerthread.cpp @@ -34,8 +34,8 @@ //============================================================================ // Run on MAIN thread -LLWorkerThread::LLWorkerThread(const std::string& name, bool threaded) : - LLQueuedThread(name, threaded) +LLWorkerThread::LLWorkerThread(const std::string& name, bool threaded, bool should_pause) : + LLQueuedThread(name, threaded, should_pause) { mDeleteMutex = new LLMutex; } |