diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-12-05 18:55:01 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-12-05 18:55:01 -0600 |
| commit | 1a93abb9013d6960f1ff9eb491480f547c780ff0 (patch) | |
| tree | 003b41d62ff71936d43de55a2f9ff4f0a6668b09 /indra/newview | |
| parent | 1516e4c4971152273dc4f1055eaaae117419a8f6 (diff) | |
SH-2652 Bump fast timer location.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 2e1dc95483..126d0f75e8 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -423,7 +423,6 @@ static LLFastTimer::DeclareTimer FTM_TEXTURE_MEMORY_CHECK("Memory Check"); bool LLViewerTexture::isMemoryForTextureLow() { const F32 WAIT_TIME = 1.0f ; //second - LLFastTimer t(FTM_TEXTURE_MEMORY_CHECK); static LLFrameTimer timer ; if(timer.getElapsedTimeF32() < WAIT_TIME) //call this once per second. @@ -432,6 +431,8 @@ bool LLViewerTexture::isMemoryForTextureLow() } timer.reset() ; + LLFastTimer t(FTM_TEXTURE_MEMORY_CHECK); + const S32 MIN_FREE_TEXTURE_MEMORY = 5 ; //MB const S32 MIN_FREE_MAIN_MEMORy = 100 ; //MB |