diff options
| author | callum <none@none> | 2012-06-15 13:00:49 -0700 |
|---|---|---|
| committer | callum <none@none> | 2012-06-15 13:00:49 -0700 |
| commit | 2eedd0c3c0fa8b4360c1402c1fb604010a4a2d82 (patch) | |
| tree | d2c5ccf950227d0b62d73b60f40ed61fbf64f473 /indra/newview/llworld.cpp | |
| parent | 8006203bdae4e78b4eeb54e715190ace58f43556 (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 14867db182..03fef07c11 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -657,7 +657,10 @@ void LLWorld::updateRegions(F32 max_update_time) if (did_one && max_time <= 0.f) break; max_time = llmin(max_time, max_update_time*.1f); - did_one |= regionp->idleUpdate(max_update_time); + if (regionp->idleUpdate(max_update_time)) + { + did_one = TRUE; + } } } |