livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
Rider Linden 2017-01-27 09:26:42 -08:00
parent e51fd03945 cb73d43bf6
commit a65e3385f1
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llkdu/llimagej2ckdu.cpp
View File

@ -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:

8
indra/newview/llappviewer.cpp
View File

@ -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() ;