livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-10803 : Fix for upload info not fetched on texture preview floater until reopening 

Bug manifested itself when previewing a texture that was allready loaded and saved in VFS but not yet fetched into memory.
Fix was to add a loaded texture callback that updated the floater.
meow-7.2.2
Techwolf Lupindo 2013-06-30 22:41:31 -04:00
parent 6c6070ba78
commit 2bcd4323ac
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llpreviewtexture.cpp
View File

@ -788,6 +788,13 @@ void LLPreviewTexture::onButtonClickUUID()
std::string uuid = mImageID.asString();
LLClipboard::instance().copyToClipboard(utf8str_to_wstring(uuid), 0, uuid.size());
}
/* static */
void LLPreviewTexture::onTextureLoaded(BOOL success, LLViewerFetchedTexture* src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata)
{
LLPreviewTexture* self = (LLPreviewTexture*)userdata;
self->mUpdateDimensions = TRUE;
}
// </FS:Techwolf Lupindo> texture comment decoder
// Return true if everything went fine, false if we somewhat modified the ratio as we bumped on border values
@ -840,6 +847,9 @@ void LLPreviewTexture::loadAsset()
mImageOldBoostLevel = mImage->getBoostLevel();
mImage->setBoostLevel(LLGLTexture::BOOST_PREVIEW);
mImage->forceToSaveRawImage(0) ;
// <FS:Techwolf Lupindo> texture comment decoder
mImage->setLoadedCallback(LLPreviewTexture::onTextureLoaded, 0, TRUE, FALSE, this, NULL);
// </FS:Techwolf Lupindo>
mAssetStatus = PREVIEW_ASSET_LOADING;
mUpdateDimensions = TRUE;
updateDimensions();

1
indra/newview/llpreviewtexture.h
View File

@ -89,6 +89,7 @@ public:
void callbackLoadName(const LLUUID& agent_id, const LLAvatarName& av_name);
void onButtonClickProfile();
void onButtonClickUUID();
static void onTextureLoaded(BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata);
// </FS:Techwolf Lupindo>
protected: