diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-11 16:32:04 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-11 16:32:04 +0300 |
commit | bf1df45f617301f5b46bac91f08d2e173f28e2cd (patch) | |
tree | 0c68d6ffe837275eaa15d89af8210ffad01ce2a9 /indra/newview/llviewertexturelist.cpp | |
parent | 863e380fb61121c977a6101b47accdb813c328af (diff) | |
parent | 766eaf9a50218864480001550f3622e34684f4da (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
-rw-r--r-- | indra/newview/llviewertexturelist.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 31f0998fab..02097ea06d 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -853,14 +853,14 @@ F32 LLViewerTextureList::updateImagesFetchTextures(F32 max_time) } min_count--; } - if (fetch_count == 0) - { - gDebugTimers[0].pause(); - } - else - { - gDebugTimers[0].unpause(); - } + //if (fetch_count == 0) + //{ + // gDebugTimers[0].pause(); + //} + //else + //{ + // gDebugTimers[0].unpause(); + //} return image_op_timer.getElapsedTimeF32(); } |