diff options
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())  | 
