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

FIRE-11813: Proper fix for pure virtual function call crash in OXP export floater

master
Ansariel 2020-11-11 00:30:07 +01:00
parent 64355d73f6
commit dd82169fd2
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/fsfloaterexport.cpp
View File

@ -32,7 +32,6 @@
#include "lfsimfeaturehandler.h"
#include "llagent.h"
//#include "llagentconstants.h"
#include "llagentdata.h"
#include "llavatarnamecache.h"
#include "llbufferstream.h"
@ -212,6 +211,15 @@ FSFloaterObjectExport::~FSFloaterObjectExport()
{
gIdleCallbacks.deleteFunction(FSFloaterObjectExport::onIdle, this);
}
for (const auto& object_id : mInventoryRequests)
{
LLViewerObject* object = gObjectList.findObject(object_id);
if (object)
{
object->removeInventoryListener(this);
}
}
}
BOOL FSFloaterObjectExport::postBuild()
@ -1098,7 +1106,7 @@ void FSFloaterObjectExport::onExportFileSelected(const std::vector<std::string>&
if (!exportSelection())
{
LLNotificationsUtil::add("ExportFailed");
//closeFloater();
closeFloater();
}
}