summaryrefslogtreecommitdiff
path: root/indra/llcommon/llqueuedthread.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-10-04 20:12:51 -0400
committerOz Linden <oz@lindenlab.com>2012-10-04 20:12:51 -0400
commit07899b2820599600fac889355c1742c81d69d051 (patch)
treed6166632b77cf4428cbfbf0016c15a85ff87e515 /indra/llcommon/llqueuedthread.cpp
parent7fe8e87d19f4940d9b682faa7e189d1b1ac18785 (diff)
parenta5e28651f539ff0f9bb9a678538d70b5fa9f97ba (diff)
merge changes for DRTVWR-222
Diffstat (limited to 'indra/llcommon/llqueuedthread.cpp')
-rw-r--r--indra/llcommon/llqueuedthread.cpp4
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
{