diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-17 15:27:39 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-17 15:27:39 -0700 |
| commit | c320b4878ae9cd166594285a88437f0d5c333353 (patch) | |
| tree | d4b8f11a01bfbeb30cd8e8de96e8c12a1364ff47 /indra/llcommon/llqueuedthread.cpp | |
| parent | 3ee73ee98d31e572e284371074b7cd4744005a29 (diff) | |
| parent | 33bd704c58fa707d0a4cc89216538c9d64d6e109 (diff) | |
merging in latest code
Diffstat (limited to 'indra/llcommon/llqueuedthread.cpp')
| -rw-r--r-- | indra/llcommon/llqueuedthread.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp index 1738c16dea..abf47a0f57 100644 --- a/indra/llcommon/llqueuedthread.cpp +++ b/indra/llcommon/llqueuedthread.cpp @@ -134,8 +134,8 @@ S32 LLQueuedThread::updateQueue(F32 max_time_ms) pending = getPending(); if(pending > 0) { - unpause(); - } + unpause(); + } } else { |