diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-06 13:09:48 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-06 13:09:48 -0800 |
| commit | 78db8dd83b76466df83abc32d56aa74ac7b180f3 (patch) | |
| tree | 369b4d8db3081fcf71a27572a00d310c7b9aaaf6 /indra/newview/llviewerdisplay.cpp | |
| parent | d4f790f72866b43956ce4216bf6471c85f4afc6c (diff) | |
| parent | 3f8172707833f30d3c39d165c975bd3d97511080 (diff) | |
merge from remote repo
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index a6a72e9666..e0bb8fedeb 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -712,7 +712,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) gBumpImageList.updateImages(); // must be called before gTextureList version so that it's textures are thrown out first. - const F32 max_image_decode_time = llmin(0.005f, 0.005f*10.f*gFrameIntervalSeconds); // 50 ms/second decode time (no more than 5ms/frame) + F32 max_image_decode_time = 0.050f*gFrameIntervalSeconds; // 50 ms/second decode time + max_image_decode_time = llclamp(max_image_decode_time, 0.001f, 0.005f ); // min 1ms/frame, max 5ms/frame) gTextureList.updateImages(max_image_decode_time); //remove dead textures from GL |