diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-18 13:52:05 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-18 13:52:05 +0200 |
commit | 2a49de3befff5e2b48a273f70a21f525b50a189c (patch) | |
tree | d96f3ceaa848345e1857e71a1a12cd0ba0f6c4bf /indra/newview/llviewertexturelist.cpp | |
parent | 688e66fe299ba4f4afe080d907a4eff9cc77f6dd (diff) | |
parent | ad65fa11acdf7f655f32e6ca43b2f2bc997ef1e6 (diff) |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
-rw-r--r-- | indra/newview/llviewertexturelist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index e066546bd8..8252b7df00 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -588,7 +588,7 @@ void LLViewerTextureList::updateImages(F32 max_time) F32 total_max_time = max_time; max_time -= updateImagesFetchTextures(max_time); - max_time = llmax(max_time, total_max_time*.25f); // at least 25% of max_time + max_time = llmax(max_time, total_max_time*.50f); // at least 50% of max_time max_time -= updateImagesCreateTextures(max_time); if (!mDirtyTextureList.empty()) |