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

LSL bridge: Use LLScriptAssetUpload for task upload instead of FSMonoScriptAssetUpload

meow-7.2.2
Ansariel 2018-11-19 19:26:17 +01:00
parent a594a004e5
commit 2ada052892
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/fslslbridge.cpp
View File

@ -1198,22 +1198,6 @@ FSLSLBridgeScriptCallback::~FSLSLBridgeScriptCallback()
{
}
class FSMonoScriptAssetUpload: public LLScriptAssetUpload
{
public:
FSMonoScriptAssetUpload(LLUUID itemId, std::string buffer, invnUploadFinish_f finish)
: LLScriptAssetUpload( itemId, buffer, finish)
{
}
virtual LLSD generatePostBody()
{
LLSD body = LLScriptAssetUpload::generatePostBody();
body["target"] = "mono";
return body;
}
};
void FSLSLBridgeScriptCallback::fire(const LLUUID& inv_item)
{
if (inv_item.isNull() || !FSLSLBridge::instance().getBridgeCreating())
@ -1238,7 +1222,7 @@ void FSLSLBridgeScriptCallback::fire(const LLUUID& inv_item)
gInventory.updateItem(item);
gInventory.notifyObservers();
LLViewerObject* obj(NULL);
LLViewerObject* obj(nullptr);
if (FSLSLBridge::instance().isBridgeValid())
{
@ -1259,7 +1243,7 @@ void FSLSLBridgeScriptCallback::fire(const LLUUID& inv_item)
const std::string fName = prepUploadFile(buffer);
if (!fName.empty())
{
LLResourceUploadInfo::ptr_t uploadInfo(new FSMonoScriptAssetUpload( inv_item, buffer, uploadDone ));
LLResourceUploadInfo::ptr_t uploadInfo(new LLScriptAssetUpload(obj->getID(), inv_item, LLScriptAssetUpload::MONO, true, LLUUID::null, buffer, uploadDone));
LLViewerAssetUpload::EnqueueInventoryUpload(url, uploadInfo);
LL_INFOS("FSLSLBridge") << "updating script ID for bridge" << LL_ENDL;