diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 11:55:27 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 11:55:27 +0300 |
| commit | 1b19919eff1104f9f1ee97004420e91c45349e29 (patch) | |
| tree | a0b7c8b06bf198f1a138c181d086d8c26d11ad72 /indra/newview/llthumbnailctrl.cpp | |
| parent | 86bf599e2895b60c04fb688b9ad118c83e075be3 (diff) | |
| parent | 18f23d9a559d3b5ed61d4fc4d3cfa9fa6c50689c (diff) | |
Merge commit '18f23d9a55' into marchcat/c-develop
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llagent.cpp
# indra/newview/llavatarrenderinfoaccountant.cpp
# indra/newview/llcontrolavatar.cpp
# indra/newview/llinspecttexture.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvovolume.cpp
Diffstat (limited to 'indra/newview/llthumbnailctrl.cpp')
| -rw-r--r-- | indra/newview/llthumbnailctrl.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/llthumbnailctrl.cpp b/indra/newview/llthumbnailctrl.cpp index ae21d3e733..b077262f06 100644 --- a/indra/newview/llthumbnailctrl.cpp +++ b/indra/newview/llthumbnailctrl.cpp @@ -111,7 +111,9 @@ void LLThumbnailCtrl::draw() gl_draw_scaled_image( draw_rect.mLeft, draw_rect.mBottom, draw_rect.getWidth(), draw_rect.getHeight(), mTexturep, UI_VERTEX_COLOR % alpha); - mTexturep->setKnownDrawSize(draw_rect.getWidth(), draw_rect.getHeight()); + // Thumbnails are usually 256x256 or smaller, either report that or + // some high value to get image with higher priority + mTexturep->setKnownDrawSize(MAX_IMAGE_SIZE, MAX_IMAGE_SIZE); } else if( mImagep.notNull() ) { @@ -238,12 +240,8 @@ void LLThumbnailCtrl::initImage() { // Should it support baked textures? mTexturep = LLViewerTextureManager::getFetchedTexture(mImageAssetID, FTT_DEFAULT, MIPMAP_YES, LLGLTexture::BOOST_THUMBNAIL); - mTexturep->forceToSaveRawImage(0); - - S32 desired_draw_width = MAX_IMAGE_SIZE; - S32 desired_draw_height = MAX_IMAGE_SIZE; - mTexturep->setKnownDrawSize(desired_draw_width, desired_draw_height); + mTexturep->setKnownDrawSize(MAX_IMAGE_SIZE, MAX_IMAGE_SIZE); } } else if (tvalue.isString()) |