diff options
| author | Callum Linden <callum@lindenlab.com> | 2022-10-24 17:48:16 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2022-10-24 17:48:16 -0700 |
| commit | 80585d56fd6ccb0875c6353c7620a8ada749d66d (patch) | |
| tree | 139699b14e49609532ca717f9086f2039795801e /indra/newview/llviewertexturelist.cpp | |
| parent | b0d69a20c262441125261c4949e59a8a1b9e9628 (diff) | |
| parent | e45b6159666b3aa271eaaa366fb4bcade2c2a28b (diff) | |
Merge master into DRTVWR-568 (and fix conflicts)
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 815d8e9486..441648d4e9 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1155,7 +1155,8 @@ F32 LLViewerTextureList::updateImagesFetchTextures(F32 max_time) iter3 != entries.end(); ) { LLViewerFetchedTexture* imagep = *iter3++; - imagep->updateFetch(); + imagep->updateFetch(); + if (min_count <= min_update_count) { mLastFetchKey = LLTextureKey(imagep->getID(), (ETexListType)imagep->getTextureListType()); |