diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-09-16 21:46:54 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-09-16 21:46:54 -0600 |
| commit | fb82d0c4dbb6f6e3c58cca6ab69d638bda851b34 (patch) | |
| tree | 722548c268be0acd8221552f49e20e351908a392 | |
| parent | 42d66af3187994d729305fb332668610374bde30 (diff) | |
| parent | e86853db2ceb4e36e32482c88403bc1e3ee037eb (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
| -rwxr-xr-x | indra/newview/llworld.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 6a2653bc88..9009626a03 100755 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -663,9 +663,6 @@ void LLWorld::updateVisibilities() void LLWorld::updateRegions(F32 max_update_time) { - LLTimer update_timer; - BOOL did_one = FALSE; - if(LLViewerCamera::getInstance()->isChanged()) { LLViewerRegion::sLastCameraUpdated = LLViewerOctreeEntryData::getCurrentFrame() + 1; @@ -676,15 +673,7 @@ void LLWorld::updateRegions(F32 max_update_time) for (region_list_t::iterator iter = mRegionList.begin(); iter != mRegionList.end(); ++iter) { - LLViewerRegion* regionp = *iter; - F32 max_time = max_update_time - update_timer.getElapsedTimeF32(); - if (did_one && max_time <= 0.f) - break; - max_time = llmin(max_time, max_update_time*.1f); - if (regionp->idleUpdate(max_update_time)) - { - did_one = TRUE; - } + (*iter)->idleUpdate(max_update_time); } mNumOfActiveCachedObjects = 0; |