diff options
author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-10-18 22:29:02 +0300 |
---|---|---|
committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-10-18 22:29:02 +0300 |
commit | c43cfcdcbd243410e2f780f58f93100e96fc996c (patch) | |
tree | d5daa0187843a9302c1011937d452d40692d0d1a /indra/llcommon/llqueuedthread.cpp | |
parent | c0b60841ce14a1c449ede17284d2aa6939322be3 (diff) | |
parent | f9c068462f379a4678e59090a066cfa173504c6b (diff) |
merge into latest changes
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 { |