diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-01-27 09:26:42 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-01-27 09:26:42 -0800 |
| commit | a65e3385f19756d7677b15383f0c40c96b4e3604 (patch) | |
| tree | b37bf0a2aa64c1849b1b1756f9ec249d948c3ae3 /indra/newview/llappviewer.cpp | |
| parent | e51fd03945ac0b2094b809c212eaa85b69ed0420 (diff) | |
| parent | cb73d43bf6ba1a4d6fdac6245eed328e62927f8d (diff) | |
Merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 038a8e3ff3..5eb82a2d0b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1490,11 +1490,9 @@ bool LLAppViewer::frame() ms_sleep(500); } - const F64Milliseconds max_idle_time = llmin(.005f*10.f*(F32Milliseconds)gFrameTimeSeconds, F32Milliseconds(5)); // 5 ms a second idleTimer.reset(); S32 total_work_pending = 0; S32 total_io_pending = 0; - while(1) { S32 work_pending = 0; S32 io_pending = 0; @@ -1518,11 +1516,7 @@ bool LLAppViewer::frame() total_work_pending += work_pending ; total_io_pending += io_pending ; - - if (!work_pending || idleTimer.getElapsedTimeF64() >= max_idle_time) - { - break; - } + } gMeshRepo.update() ; |