diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-13 18:06:49 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-13 18:06:49 -0500 |
| commit | 9605da154efc0b4913bc68082b8876b660d205b1 (patch) | |
| tree | da58722a5ef1d3e02a849d5ce986eb22a968d41f /indra/newview/llworld.cpp | |
| parent | c559e3d6b93216496065cd05dd2734b726d61201 (diff) | |
| parent | b93a23aa828a2ee6de206fe3c74d1b0f3e116db1 (diff) | |
merge
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; + } } } |