From 1a93abb9013d6960f1ff9eb491480f547c780ff0 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 5 Dec 2011 18:55:01 -0600
Subject: SH-2652 Bump fast timer location.
---
indra/newview/llviewertexture.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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
--
cgit v1.2.3