diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp index aa405362e8c0fc22c8cf04bded5aa12d89d86983..dce421632070a4a7afc4ca2ca885ee880ef259bc 100644 --- a/indra/llkdu/llimagej2ckdu.cpp +++ b/indra/llkdu/llimagej2ckdu.cpp @@ -91,6 +91,7 @@ std::ostream& operator<<(std::ostream& out, const kdu_dims& dims) "[" << dims.size.x << "x" << dims.size.y << "]"; } + class kdc_flow_control { public: diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 038a8e3ff321691aa5e2f7d39f2fcb62f533906d..5eb82a2d0ba2a7b54edf4aa7752b1d1edb32b337 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() ;