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/llqueuedthread.cpp | |
parent | a69ae967243e19bdc5969c34f0b1e94be794919d (diff) | |
parent | aabdbeadf53b3a20b4db563a23535af74fd7d4b7 (diff) |
merge changes for vwr-27090
Diffstat (limited to 'indra/llcommon/llqueuedthread.cpp')
-rw-r--r-- | indra/llcommon/llqueuedthread.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp index efd9c4b68f..5dee7a3541 100644 --- a/indra/llcommon/llqueuedthread.cpp +++ b/indra/llcommon/llqueuedthread.cpp @@ -32,7 +32,7 @@ //============================================================================ // MAIN THREAD -LLQueuedThread::LLQueuedThread(const std::string& name, bool threaded) : +LLQueuedThread::LLQueuedThread(const std::string& name, bool threaded, bool should_pause) : LLThread(name), mThreaded(threaded), mIdleThread(TRUE), @@ -41,6 +41,11 @@ LLQueuedThread::LLQueuedThread(const std::string& name, bool threaded) : { if (mThreaded) { + if(should_pause) + { + pause() ; //call this before start the thread. + } + start(); } } |