Merged in lindenlab/viewer-bear

1 files changed, 0 insertions, 220 deletions

diff --git a/indra/newview/llassetuploadqueue.cpp b/indra/newview/llassetuploadqueue.cpp
deleted file mode 100755
index 359ee1e221..0000000000
--- a/indra/newview/llassetuploadqueue.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-/** 
- * @file llassetupload.cpp
- * @brief Serializes asset upload request
- *
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/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
-{
-	LOG_CLASS(LLAssetUploadChainResponder);
-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;
-	}
-	
-protected:
-	virtual void httpFailure()
-	{
-		// Parent class will spam the failure.
-		//LL_WARNS() << dumpResponse() << LL_ENDL;
-		LLUpdateTaskInventoryResponder::httpFailure();
-		LLAssetUploadQueue *queue = mSupplier->get();
-		if (queue)
-		{
-			queue->request(&mSupplier);
-		}
-	}
-
-	virtual void httpSuccess()
-	{
-		LLUpdateTaskInventoryResponder::httpSuccess();
-		LLAssetUploadQueue *queue = mSupplier->get();
-		if (queue)
-		{
-			// Responder is reused across 2 phase upload,
-			// so only start next upload after 2nd phase complete.
-			const std::string& state = getContent()["state"].asStringRef();
-			if(state == "complete")
-			{
-				queue->request(&mSupplier);
-			}
-		}
-	}
-	
-public:
-	virtual void uploadUpload(const LLSD& content)
-	{
-		std::string uploader = content["uploader"];
-
-		mSupplier->log(std::string("Compiling " + mScriptName).c_str());
-		LL_INFOS() << "Compiling " << LL_ENDL;
-
-		// 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");
-			LL_INFOS() << "Compiled!" << LL_ENDL;
-		}
-		else
-		{
-			LLSD compile_errors = content["errors"];
-			for(LLSD::array_const_iterator line	= compile_errors.beginArray();
-				line < compile_errors.endArray(); line++)
-			{
-				std::string str = line->asString();
-				str.erase(std::remove(str.begin(), str.end(), '\n'), str.end());
-				mSupplier->log(str);
-				LL_INFOS() << content["errors"] << LL_ENDL;
-			}
-		}
-		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";
-	body["experience"] = data.mExperienceId;
-
-	std::string url = "";
-	LLViewerObject* object = gObjectList.findObject(data.mTaskId);
-	if (object)
-	{
-		url = object->getRegion()->getCapability("UpdateScriptTask");
-		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,
-							   const LLUUID& experience_id)
-{
-	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;
-	data.mExperienceId = experience_id;
-			
-	mQueue.push_back(data);
-
-	if(mSupplier)
-	{
-		request(&mSupplier);
-	}	
-}
-
-LLAssetUploadQueueSupplier::~LLAssetUploadQueueSupplier()
-{
-}