diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-11 10:31:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-11 10:31:39 -0400 |
| commit | baf802e25b1006783a69625e90022db087aabbfb (patch) | |
| tree | b263824abb55c00034ad46513b603b493bc2ff8b /indra/llcommon/llworkerthread.cpp | |
| parent | bba1141facb9b0e0ed6bb73535fca1f20ddcfa59 (diff) | |
| parent | 5ef05e151d24e15a175d4f78ff17b6abdd36bbc4 (diff) | |
merge changes for STORM-1641
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; } |