From 2ada052892180320e60ad45fe252efa7cf534c0c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 19 Nov 2018 19:26:17 +0100 Subject: [PATCH] LSL bridge: Use LLScriptAssetUpload for task upload instead of FSMonoScriptAssetUpload --- indra/newview/fslslbridge.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp index a1dbd4bf2b..d80bc30cbc 100644 --- a/indra/newview/fslslbridge.cpp +++ b/indra/newview/fslslbridge.cpp @@ -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;