1 files changed, 194 insertions, 0 deletions
diff --git a/indra/newview/llassetuploadqueue.cpp b/indra/newview/llassetuploadqueue.cpp
new file mode 100644
index 0000000000..c52c189d56
--- /dev/null
+++ b/indra/newview/llassetuploadqueue.cpp
@@ -0,0 +1,194 @@
+/** 
+ * @file llassetupload.cpp
+ * @brief Serializes asset upload request
+ * Copyright (c) 2007, Linden Research, Inc.
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llassetuploadqueue.h"
+#include "llviewerregion.h"
+#include "llviewerobjectlist.h"
+
+#include "llassetuploadresponders.h"
+#include "llsd.h"
+#include <iostream>
+
+class LLAssetUploadChainResponder : public LLUpdateTaskInventoryResponder
+{
+public:
+	
+	LLAssetUploadChainResponder(const LLSD& post_data,
+								const std::string& file_name,
+								const LLUUID& queue_id,
+								U8* data, 
+								U32 data_size,
+								std::string script_name,
+								LLAssetUploadQueueSupplier *supplier) :
+		LLUpdateTaskInventoryResponder(post_data, file_name, queue_id, LLAssetType::AT_LSL_TEXT),
+		mSupplier(supplier),
+		mData(data),
+		mDataSize(data_size),
+		mScriptName(script_name)
+	{
+ 	}
+
+	virtual ~LLAssetUploadChainResponder() 
+   	{
+   		if(mSupplier)
+   		{
+   			LLAssetUploadQueue *queue = mSupplier->get();
+   			if (queue)
+   			{
+   				// Give ownership of supplier back to queue.
+   				queue->mSupplier = mSupplier;
+   				mSupplier = NULL;
+   			}
+   		}
+   		delete mSupplier;
+		delete mData;
+   	}
+	
+	virtual void error(U32 statusNum, const std::string& reason)
+   	{
+		llwarns << "Error: " << reason << llendl;
+		LLUpdateTaskInventoryResponder::error(statusNum, reason);
+   		LLAssetUploadQueue *queue = mSupplier->get();
+   		if (queue)
+		{
+   			queue->request(&mSupplier);
+   		}
+   	}
+
+	virtual void result(const LLSD& content)
+   	{
+		LLUpdateTaskInventoryResponder::result(content);
+   		LLAssetUploadQueue *queue = mSupplier->get();
+   		if (queue)
+   		{
+   			// Responder is reused across 2 phase upload,
+   			// so only start next upload after 2nd phase complete.
+   			std::string state = content["state"];
+   			if(state == "complete")
+   			{
+   				queue->request(&mSupplier);
+   			}
+   		}	
+   	}
+	
+	virtual void uploadUpload(const LLSD& content)
+	{
+		std::string uploader = content["uploader"];
+
+		mSupplier->log(std::string("Compiling " + mScriptName).c_str());
+		llinfos << "Compiling " << llendl;
+
+		// postRaw takes ownership of mData and will delete it.
+		LLHTTPClient::postRaw(uploader, mData, mDataSize, this);
+		mData = NULL;
+		mDataSize = 0;
+	}
+
+	virtual void uploadComplete(const LLSD& content)
+	{
+		// Bytecode save completed
+		if (content["compiled"])
+		{
+			mSupplier->log("Compilation succeeded");
+			llinfos << "Compiled!" << llendl;
+		}
+		else
+		{
+			LLSD compile_errors = content["errors"];
+			for(LLSD::array_const_iterator line	= compile_errors.beginArray();
+				line < compile_errors.endArray(); line++)
+			{
+				mSupplier->log(line->asString());
+				llinfos << content["errors"] << llendl;
+			}
+		}
+		LLUpdateTaskInventoryResponder::uploadComplete(content);
+	}
+
+	LLAssetUploadQueueSupplier *mSupplier;
+	U8* mData;
+	U32 mDataSize;
+	std::string mScriptName;
+};
+
+
+LLAssetUploadQueue::LLAssetUploadQueue(LLAssetUploadQueueSupplier *supplier) :
+	mSupplier(supplier)
+{
+}
+
+//virtual 
+LLAssetUploadQueue::~LLAssetUploadQueue()
+{
+	delete mSupplier;
+}
+
+// Takes ownership of supplier.
+void LLAssetUploadQueue::request(LLAssetUploadQueueSupplier** supplier)
+{
+	if (mQueue.empty())
+		return;
+
+	UploadData data = mQueue.front();
+	mQueue.pop_front();
+	
+	LLSD body;
+	body["task_id"] = data.mTaskId;
+	body["item_id"] = data.mItemId;
+	body["is_script_running"] = data.mIsRunning;
+	body["target"] = data.mIsTargetMono? "mono" : "lsl2";
+
+	std::string url = "";
+	LLViewerObject* object = gObjectList.findObject(data.mTaskId);
+	if (object)
+	{
+		url = object->getRegion()->getCapability("UpdateScriptTaskInventory");
+		LLHTTPClient::post(url, body,
+							new LLAssetUploadChainResponder(
+								body, data.mFilename, data.mQueueId, 
+								data.mData, data.mDataSize, data.mScriptName, *supplier));
+	}
+
+	*supplier = NULL;
+}
+
+void LLAssetUploadQueue::queue(const std::string& filename,
+							   const LLUUID& task_id,
+							   const LLUUID& item_id,
+							   BOOL is_running, 
+							   BOOL is_target_mono, 
+							   const LLUUID& queue_id,
+							   U8* script_data,
+							   U32 data_size,
+							   std::string script_name)
+{
+	UploadData data;
+	data.mTaskId = task_id;
+	data.mItemId = item_id;
+	data.mIsRunning = is_running;
+	data.mIsTargetMono = is_target_mono;
+	data.mQueueId = queue_id;
+	data.mFilename = filename;
+	data.mData = script_data;
+	data.mDataSize = data_size;
+	data.mScriptName = script_name;
+			
+	mQueue.push_back(data);
+
+	if(mSupplier)
+	{
+		request(&mSupplier);
+	}	
+}
+
+LLAssetUploadQueueSupplier::~LLAssetUploadQueueSupplier()
+{
+}