summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2012-07-23 17:41:21 -0600
committerXiaohong Bao <bao@lindenlab.com>2012-07-23 17:41:21 -0600
commitd306cb059b9b56c1eb051074e19796b47e1c262d (patch)
tree0042e14006fb713067b5fb762679dbd2a314b89b /indra
parentafcc61a07a0449f390643aafea479e5ab068bda6 (diff)
a trivial code change for SH-3073. The change makes sure to clear the texture fetching queue ONLY once during a teleporting.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewertexturelist.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 29f8c291a5..b5c4c5597e 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -610,11 +610,14 @@ static LLFastTimer::DeclareTimer FTM_IMAGE_STATS("Stats");
void LLViewerTextureList::updateImages(F32 max_time)
{
static BOOL cleared = FALSE;
- if(gTeleportDisplay && !cleared)
+ if(gTeleportDisplay)
{
- clearFetchingRequests();
- gPipeline.clearRebuildGroups();
- cleared = TRUE;
+ if(!cleared)
+ {
+ clearFetchingRequests();
+ gPipeline.clearRebuildGroups();
+ cleared = TRUE;
+ }
return;
}
cleared = FALSE;