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/llqueuedthread.cpp | |
| parent | 7c2f2b526ad2b33f1e25378b5a05379de6aa0b5a (diff) | |
| parent | 62d9db2f21b2a6fb579e8f7631a4e387cc5e5b29 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
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(); } } |