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

Merge

meow-7.2.2
Ansariel 2015-04-10 00:42:54 +02:00
parent 8be5746807 cd08c3f360
commit 7f7a9b830a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llpreviewscript.cpp
View File

@ -2429,6 +2429,16 @@ void LLLiveLSLEditor::onLoadComplete(LLVFS *vfs, const LLUUID& asset_id,
{
if( LL_ERR_NOERR == status )
{
// <FS:ND> FIRE-15524 opt to not crash if the item went away ....
if( !instance->getItem() )
{
LL_WARNS() << "getItem() returns 0, item went away while loading script()" << LL_ENDL;
instance->mAssetStatus = PREVIEW_ASSET_ERROR;
delete xored_id;
return;
}
// </FS:ND>
instance->loadScriptText(vfs, asset_id, type);
instance->mScriptEd->setEnableEditing(TRUE);
instance->mAssetStatus = PREVIEW_ASSET_LOADED;