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

FIRE-15609: Possible crash fix for logout crash after using the particle editor

Ansariel 2015-02-22 11:56:52 +01:00
parent 1e75b35b4a
commit 7ebdeb97fb
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/particleeditor.cpp
View File

@ -678,7 +678,10 @@ ParticleScriptCreationCallback::~ParticleScriptCreationCallback()
void ParticleScriptCreationCallback::fire(const LLUUID& inventoryItem)
{
mEditor->callbackReturned(inventoryItem);
if (mEditor)
{
mEditor->callbackReturned(inventoryItem);
}
}
// ---------------------------------- Responders ----------------------------------
@ -696,5 +699,8 @@ ParticleScriptUploadResponder::ParticleScriptUploadResponder(const LLSD& post_da
void ParticleScriptUploadResponder::uploadComplete(const LLSD& content)
{
LLUpdateAgentInventoryResponder::uploadComplete(content);
mEditor->scriptInjectReturned(content);
if (mEditor)
{
mEditor->scriptInjectReturned(content);
}
}