diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2025-12-01 17:27:19 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2025-12-01 17:27:44 +0200 |
| commit | 1565e460830f9e3d9e4cd4d82977df6c17eb3112 (patch) | |
| tree | 74c3f90d2d0129f7d5e58805e15ed3480b241063 /indra/newview/llviewertexturelist.cpp | |
| parent | a9e8676611bf0ffda077a6d7561e0d57f9e3fcf7 (diff) | |
| parent | 906c58ac3821ce364096b7c7f2df80b67d9740b6 (diff) | |
Merge branch 'develop' into maxim/voice-moderation
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 6f79532ec3..11ca3098fd 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1111,7 +1111,6 @@ F32 LLViewerTextureList::updateImagesCreateTextures(F32 max_time) imagep->postCreateTexture(); imagep->mCreatePending = false; - mCreateTextureList.pop(); if (imagep->hasGLTexture() && imagep->getDiscardLevel() < imagep->getDesiredDiscardLevel() && (imagep->getDesiredDiscardLevel() <= MAX_DISCARD_LEVEL)) @@ -1123,6 +1122,8 @@ F32 LLViewerTextureList::updateImagesCreateTextures(F32 max_time) imagep->scaleDown(); } + mCreateTextureList.pop(); + if (create_timer.getElapsedTimeF32() > max_time) { break; |