diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-09-02 12:14:32 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-09-02 12:14:32 +0300 |
| commit | 742ecbd4ec80d0405ef34eb2411ef3ea52607c3e (patch) | |
| tree | 54ebddd6a214d7acc940cc904768c2859b86e0a1 /indra/newview | |
| parent | 1d68e07c249e978c67b71b2d3b64f4420c99fc18 (diff) | |
SL-17823 FIXED Terrain texture does not show in minimap when relogging.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llsurfacepatch.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvlcomposition.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llsurfacepatch.cpp b/indra/newview/llsurfacepatch.cpp index aeefcd6fb8..449d3d95c8 100644 --- a/indra/newview/llsurfacepatch.cpp +++ b/indra/newview/llsurfacepatch.cpp @@ -714,7 +714,7 @@ BOOL LLSurfacePatch::updateTexture() { mVObjp->dirtyGeom(); gPipeline.markGLRebuild(mVObjp); - return TRUE; + return !mSTexUpdate; } } } 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() ; |