diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-11 13:44:35 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-11 13:44:35 +0100 |
| commit | 79e767b91da71c32d499ba4ffb4ee0b972d301e4 (patch) | |
| tree | b9457a1fbc2bbd3d18462294ed2d407594b0ba79 /indra/newview/llviewertexturelist.cpp | |
| parent | 32fe67ec2ff41f989d7826f14fed0d66f0c923dc (diff) | |
| parent | f9a61bd30d2504ae1e00c64207e490cc128a144b (diff) | |
merge from viewer-release
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(); } |