diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-08-11 13:55:39 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-08-11 13:55:39 -0400 |
| commit | bd9ead6794af8a81e8859fe1143676af36f06f84 (patch) | |
| tree | 7ff7f8c69e986a855d8fc8320df532fc1c7ab461 /indra/newview/llviewertexturelist.cpp | |
| parent | 7836f0fff3bd8a8098a1c920439c0c6ef131d26c (diff) | |
| parent | f9a61bd30d2504ae1e00c64207e490cc128a144b (diff) | |
automated merge
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(); } |