diff options
author | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-06-13 02:22:03 +0200 |
---|---|---|
committer | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-06-13 02:22:03 +0200 |
commit | 15b3c9f1643368fe0c5356ea11288525bbe9fbb3 (patch) | |
tree | 3e8744a63723d3a3a3490ec6554070d0272e0f70 /indra/newview/lltexturectrl.cpp | |
parent | ae74ca80692c8bcf157e903033fcfa1778706d64 (diff) |
Fix a few merge issues
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
-rw-r--r-- | indra/newview/lltexturectrl.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 284fff4d8c..81a70a81cf 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -2243,8 +2243,11 @@ void LLTextureCtrl::draw() } else { - preview = LLViewerTextureManager::getFetchedTexture(mImageAssetID, FTT_DEFAULT, true, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); - preview->setBoostLevel(LLGLTexture::BOOST_PREVIEW); + mTexturep = LLViewerTextureManager::getFetchedTexture(mImageAssetID, FTT_DEFAULT, true, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); + mTexturep->setBoostLevel(LLGLTexture::BOOST_PREVIEW); + mTexturep->forceToSaveRawImage(0); + + preview = mTexturep; } } } |