diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-13 08:11:23 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-13 08:11:23 -0400 |
| commit | 2e26a75215bb2d708671d71c5c66e2996c11495f (patch) | |
| tree | c2cdcbf4758462b11f296c9ab200237aa33e5c71 /indra/llcommon/llworkerthread.cpp | |
| parent | a69ae967243e19bdc5969c34f0b1e94be794919d (diff) | |
| parent | aabdbeadf53b3a20b4db563a23535af74fd7d4b7 (diff) | |
merge changes for vwr-27090
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; } |