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

Guard against crashing.

meow-7.2.2
Nicky 2013-08-24 19:39:39 +02:00
parent 4a008807fb
commit 997335972b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llpreviewtexture.cpp
View File

@ -105,7 +105,15 @@ LLPreviewTexture::~LLPreviewTexture()
{
getWindow()->decBusyCount();
}
mImage->setBoostLevel(mImageOldBoostLevel);
// <FS:ND> mImage can be 0.
// mImage->setBoostLevel(mImageOldBoostLevel);
if( mImage )
mImage->setBoostLevel(mImageOldBoostLevel);
// <FS:ND>
mImage = NULL;
}
@ -848,7 +856,7 @@ void LLPreviewTexture::loadAsset()
mImage->setBoostLevel(LLGLTexture::BOOST_PREVIEW);
mImage->forceToSaveRawImage(0) ;
// <FS:Techwolf Lupindo> texture comment decoder
mImage->setLoadedCallback(LLPreviewTexture::onTextureLoaded, 0, TRUE, FALSE, this, NULL);
mImage->setLoadedCallback(LLPreviewTexture::onTextureLoaded, 0, TRUE, FALSE, this, &mCallbackTextureList);
// </FS:Techwolf Lupindo>
mAssetStatus = PREVIEW_ASSET_LOADING;
mUpdateDimensions = TRUE;