summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-04-26 08:10:26 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-04-26 08:10:26 -0700
commitb130308d1c021357523f29614f9382e39e991076 (patch)
tree7a845d9142dba169db1c1b82dd897dde32810bfd
parent37b64c18f5c016edbee97319929bc8ddc4c08762 (diff)
Restore hysteresis in llviewertexture.cpp and side-step unused var (now used again)
-rwxr-xr-xindra/newview/llviewertexture.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 0d86c42a59..d35b1c8492 100755
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -863,6 +863,11 @@ void LLViewerTexture::reorganizeFaceList()
static const F32 MAX_WAIT_TIME = 20.f; // seconds
static const U32 MAX_EXTRA_BUFFER_SIZE = 4 ;
+ if(mLastFaceListUpdateTimer.getElapsedTimeF32() < MAX_WAIT_TIME)
+ {
+ return;
+ }
+
for (U32 i = 0; i < LLRender::NUM_TEXTURE_CHANNELS; ++i)
{
if(mNumFaces[i] + MAX_EXTRA_BUFFER_SIZE > mFaceList[i].size())