diff --git a/autobuild.xml b/autobuild.xml index 5cbfe5e686..c859690c08 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2934,11 +2934,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - eb1316584188dafb591f80b46b357c737f90d1a7 + 8a04e6b3c6ff7f645219955a1389035565eb10d8 hash_algorithm sha1 url - https://github.com/secondlife/viewer-manager/releases/download/v3.0-08bf5ee/viewer_manager-3.0-08bf5ee-darwin64-08bf5ee.tar.zst + https://github.com/secondlife/viewer-manager/releases/download/v3.0-f14b5ec-D591/viewer_manager-3.0-f14b5ec-darwin64-f14b5ec.tar.zst name darwin64 @@ -2948,11 +2948,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - f4677b0ebd9880f29c118af51ada50883dd0a1e4 + a1e467c08ecbe6ab24fc8756a815a431a9b00f62 hash_algorithm sha1 url - https://github.com/secondlife/viewer-manager/releases/download/v3.0-08bf5ee/viewer_manager-3.0-08bf5ee-linux64-08bf5ee.tar.zst + https://github.com/secondlife/viewer-manager/releases/download/v3.0-f14b5ec-D591/viewer_manager-3.0-f14b5ec-linux64-f14b5ec.tar.zst name linux64 @@ -2962,11 +2962,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 7426c5a1d7eb231b476625637a1f2daba0a6bc55 + 56b613decdd36b2a17646bf3e2cfc2fed8456b8c hash_algorithm sha1 url - https://github.com/secondlife/viewer-manager/releases/download/v3.0-08bf5ee/viewer_manager-3.0-08bf5ee-windows64-08bf5ee.tar.zst + https://github.com/secondlife/viewer-manager/releases/download/v3.0-f14b5ec-D591/viewer_manager-3.0-f14b5ec-windows64-f14b5ec.tar.zst name windows64 @@ -2978,8 +2978,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors LICENSE copyright Copyright (c) 2000-2012, Linden Research, Inc. - version - 3.0-08bf5ee name viewer-manager description @@ -2988,6 +2986,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors https://bitbucket.org/lindenlab/vmp-standalone source_type hg + version + 3.0-f14b5ec vlc-bin diff --git a/indra/newview/llfloaterprofiletexture.cpp b/indra/newview/llfloaterprofiletexture.cpp index 94340eb36f..013c7313d7 100644 --- a/indra/newview/llfloaterprofiletexture.cpp +++ b/indra/newview/llfloaterprofiletexture.cpp @@ -144,6 +144,13 @@ void LLFloaterProfileTexture::draw() static LLCachedControl max_opacity(gSavedSettings, "PickerContextOpacity", 0.4f); drawConeToOwner(mContextConeOpacity, max_opacity, owner); + if (mImage.notNull()) + { + // Pump the texture priority + mImage->addTextureStats(MAX_IMAGE_AREA); + mImage->setKnownDrawSize(LLViewerTexture::MAX_IMAGE_SIZE_DEFAULT, LLViewerTexture::MAX_IMAGE_SIZE_DEFAULT); + } + LLFloater::draw(); } @@ -183,6 +190,8 @@ void LLFloaterProfileTexture::loadAsset(const LLUUID &image_id) mImageID = image_id; mImage = LLViewerTextureManager::getFetchedTexture(mImageID, FTT_DEFAULT, MIPMAP_TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); mImageOldBoostLevel = mImage->getBoostLevel(); + mImage->setKnownDrawSize(LLViewerTexture::MAX_IMAGE_SIZE_DEFAULT, LLViewerTexture::MAX_IMAGE_SIZE_DEFAULT); + mImage->forceToSaveRawImage(0); if ((mImage->getFullWidth() * mImage->getFullHeight()) == 0) {