diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2023-02-15 15:11:35 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2023-02-15 15:11:35 -0500 |
commit | aec39a0f9f7f16a7970e96bad552ca684af57e3f (patch) | |
tree | 742bfd7fee6d2cf98a9a93b5fc3d17ff2ca6557c /indra/newview/llvlcomposition.cpp | |
parent | 6ef3df54b3ff0dcfed3000819209a7633e53a32b (diff) | |
parent | 23a3da37a91ea80311b5820c48a12d56b989f69d (diff) |
SL-18330: Merge branch 'contribute' into sl-18330-merge
Diffstat (limited to 'indra/newview/llvlcomposition.cpp')
-rw-r--r-- | indra/newview/llvlcomposition.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llvlcomposition.cpp b/indra/newview/llvlcomposition.cpp index 46beac8255..0e6734f6e0 100644 --- a/indra/newview/llvlcomposition.cpp +++ b/indra/newview/llvlcomposition.cpp @@ -287,6 +287,12 @@ BOOL LLVLComposition::generateTexture(const F32 x, const F32 y, BOOL delete_raw = (mDetailTextures[i]->reloadRawImage(ddiscard) != NULL) ; if(mDetailTextures[i]->getRawImageLevel() != ddiscard)//raw iamge is not ready, will enter here again later. { + if (mDetailTextures[i]->getDecodePriority() <= 0.0f && !mDetailTextures[i]->hasSavedRawImage()) + { + mDetailTextures[i]->setBoostLevel(LLGLTexture::BOOST_MAP); + mDetailTextures[i]->forceToRefetchTexture(ddiscard); + } + if(delete_raw) { mDetailTextures[i]->destroyRawImage() ; |