diff options
| author | Richard Linden <none@none> | 2011-10-15 18:14:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-15 18:14:49 -0700 |
| commit | 4aed73ceb18c656e0f36c91bd0efb9a705341629 (patch) | |
| tree | 013b1382be366aa2a9d1caf7bb563e04f7d8b2ed /indra/llcommon/llworkerthread.cpp | |
| parent | 7c2f2b526ad2b33f1e25378b5a05379de6aa0b5a (diff) | |
| parent | 62d9db2f21b2a6fb579e8f7631a4e387cc5e5b29 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
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; } |