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

Fix possible crash in LSL bridge

meow-7.2.2
Ansariel 2015-07-30 19:13:57 +02:00
parent f64e65b975
commit f64f55ba91
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/fslslbridge.cpp
View File

@ -1270,6 +1270,12 @@ void FSLSLBridge::checkBridgeScriptName(const std::string& fileName)
if (fileOnly == UPLOAD_SCRIPT_CURRENT)
{
if (!isBridgeValid())
{
cleanUpBridge();
return;
}
//this is our script upload
LLViewerObject* obj = gAgentAvatarp->getWornAttachment(mpBridge->getUUID());
if (obj == NULL)
@ -1278,12 +1284,9 @@ void FSLSLBridge::checkBridgeScriptName(const std::string& fileName)
cleanUpBridge();
return;
}
//registerVOInventoryListener(obj, NULL);
obj->saveScript(gInventory.getItem(mScriptItemID), TRUE, false);
FSLSLBridgeCleanupTimer* objTimer = new FSLSLBridgeCleanupTimer((F32)1.0);
objTimer->startTimer();
//obj->doInventoryCallback();
//requestVOInventory();
}
}
@ -1317,7 +1320,6 @@ void FSLSLBridge::finishBridge()
setBridgeCreating(false);
mIsFirstCallDone = false;
//removeVOInventoryListener();
cleanUpOldVersions();
cleanUpBridgeFolder();