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

FIRE-15609: More possible crash fixing for logout crash after using the particle editor

Ansariel 2015-02-23 19:21:10 +01:00
parent 4518d1011a
commit aeb0faec5b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/particleeditor.cpp
View File

@ -26,6 +26,7 @@
#include <fstream>
#include "llagent.h"
#include "llappviewer.h"
#include "llassetuploadresponders.h"
#include "llcheckboxctrl.h"
#include "llclipboard.h"
@ -678,7 +679,7 @@ ParticleScriptCreationCallback::~ParticleScriptCreationCallback()
void ParticleScriptCreationCallback::fire(const LLUUID& inventoryItem)
{
if (mEditor)
if (!gDisconnected && !LLAppViewer::instance()->quitRequested() && mEditor)
{
mEditor->callbackReturned(inventoryItem);
}
@ -699,7 +700,7 @@ ParticleScriptUploadResponder::ParticleScriptUploadResponder(const LLSD& post_da
void ParticleScriptUploadResponder::uploadComplete(const LLSD& content)
{
LLUpdateAgentInventoryResponder::uploadComplete(content);
if (mEditor)
if (!gDisconnected && !LLAppViewer::instance()->quitRequested() && mEditor)
{
mEditor->scriptInjectReturned(content);
}