diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-08-10 16:44:12 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-08-10 16:44:12 -0600 |
| commit | 0582257a8afe1827547d06ff75375cc6681d9b0f (patch) | |
| tree | d9a56a9945566c433d2d418feb0a7a894bb90638 /indra/newview/llviewertexturelist.cpp | |
| parent | f5ae33fa5373d7fd6b59f4d3688575a58bc69bff (diff) | |
| parent | b9cc3a34da3aeb1a4df6d6b6c432e5201eb6e333 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/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(); } |