diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-16 08:32:26 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-16 08:32:26 -0400 |
commit | 4ac1b64665a49c7121411f3db27718f0c37eaf33 (patch) | |
tree | 85d7f3ccdacd6f322fb1fa213aa91c12b2d4abf4 /indra/llcommon/llworkerthread.cpp | |
parent | 972df2587863737eafde9caf6fce89f330358b5e (diff) | |
parent | 2f9edd050669210d651e66a86efb9746c3fa8a34 (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 3ac50832fd..4988bdf570 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(NULL); |