merge

1 files changed, 4 insertions, 5 deletions

diff --git a/indra/newview/llcompilequeue.h b/indra/newview/llcompilequeue.h
index 54842bb302..cee8efe9b0 100755
--- a/indra/newview/llcompilequeue.h
+++ b/indra/newview/llcompilequeue.h
@@ -118,8 +118,6 @@ struct LLCompileQueueData
 		mQueueID(q_id), mItemId(item_id) {}
 };
 
-class LLAssetUploadQueue;
-
 class LLFloaterCompileQueue : public LLFloaterScriptQueue
 {
 	friend class LLFloaterReg;
@@ -131,8 +129,6 @@ public:
 	// remove any object in mScriptScripts with the matching uuid.
 	void removeItemByItemID(const LLUUID& item_id);
 	
-	LLAssetUploadQueue* getUploadQueue() { return mUploadQueue; }
-
 	void experienceIdsReceived( const LLSD& content );
 	BOOL hasExperience(const LLUUID& id)const;
 
@@ -147,6 +143,8 @@ protected:
 	static void requestAsset(struct LLScriptQueueData* datap, const LLSD& experience);
 
 
+    static void finishLSLUpload(LLUUID itemId, LLUUID taskId, LLUUID newAssetId, LLSD response, std::string scriptName, LLUUID queueId);
+
 	// This is the callback for when each script arrives
 	static void scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
 								LLAssetType::EType type,
@@ -157,7 +155,8 @@ protected:
 	LLViewerInventoryItem::item_array_t mCurrentScripts;
 
 private:
-	LLAssetUploadQueue* mUploadQueue;
+    static void processExperienceIdResults(LLSD result, LLUUID parent);
+
 	uuid_list_t mExperienceIds;
 };