diff options
author | Richard Linden <none@none> | 2012-01-17 12:05:23 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2012-01-17 12:05:23 -0800 |
commit | 37593f276cacb9db7f1f8ed8ff6c1fe1b56ff883 (patch) | |
tree | 2ec32a4cf984cde8a003f45b324de328f318c675 /indra/newview/llappviewer.cpp | |
parent | 944814941d16e7853ff365acc17a16b3a20ac9cb (diff) | |
parent | facb0fa42cf7dbc4deb3a4026cc216aa0099111e (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 16d3c115ae..5c51f1b11a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1347,17 +1347,19 @@ bool LLAppViewer::mainLoop() { S32 work_pending = 0; S32 io_pending = 0; + F32 max_time = llmin(gFrameIntervalSeconds*10.f, 1.f); + { LLFastTimer ftm(FTM_TEXTURE_CACHE); - work_pending += LLAppViewer::getTextureCache()->update(1); // unpauses the texture cache thread + work_pending += LLAppViewer::getTextureCache()->update(max_time); // unpauses the texture cache thread } { LLFastTimer ftm(FTM_DECODE); - work_pending += LLAppViewer::getImageDecodeThread()->update(1); // unpauses the image thread + work_pending += LLAppViewer::getImageDecodeThread()->update(max_time); // unpauses the image thread } { LLFastTimer ftm(FTM_DECODE); - work_pending += LLAppViewer::getTextureFetch()->update(1); // unpauses the texture fetch thread + work_pending += LLAppViewer::getTextureFetch()->update(max_time); // unpauses the texture fetch thread } { |