diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-09 13:16:18 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-09 13:16:18 -0800 |
| commit | b34b82f7fea702b7cb4309195314c45fd3d2e630 (patch) | |
| tree | 8af0d2b7f2670902d9b3d7cf878081ffd7aacab7 /indra/llcommon/llqueuedthread.cpp | |
| parent | 06ba4927aa8d288b843ed1380132c14938708707 (diff) | |
| parent | dc5db676efd340bccd2c6f376c0bcba77e0507c4 (diff) | |
Automated merge with ssh://hg.lindenlab.com/brad/brad-parabuild
Diffstat (limited to 'indra/llcommon/llqueuedthread.cpp')
| -rw-r--r-- | indra/llcommon/llqueuedthread.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp index 395d298887..e7ad571a90 100644 --- a/indra/llcommon/llqueuedthread.cpp +++ b/indra/llcommon/llqueuedthread.cpp @@ -113,8 +113,11 @@ S32 LLQueuedThread::update(U32 max_time_ms) { if (!mStarted) { - startThread(); - mStarted = TRUE; + if (!mThreaded) + { + startThread(); + mStarted = TRUE; + } } return updateQueue(max_time_ms); } |