SH-3455 WIP - removing bake upload code

1 files changed, 0 insertions, 64 deletions

diff --git a/indra/newview/llviewertexlayer.h b/indra/newview/llviewertexlayer.h
index aa4bad3422..027ae255ec 100755
--- a/indra/newview/llviewertexlayer.h
+++ b/indra/newview/llviewertexlayer.h
@@ -47,8 +47,6 @@ public:
 	virtual ~LLViewerTexLayerSet();
 
 	/*virtual*/void				requestUpdate();
-	void						requestUpload();
-	void						cancelUpload();
 	BOOL						isLocalTextureDataAvailable() const;
 	BOOL						isLocalTextureDataFinal() const;
 	void						updateComposite();
@@ -116,47 +114,6 @@ protected:
 	virtual BOOL			render() { return renderTexLayerSet(); }
 	
 	//--------------------------------------------------------------------
-	// Uploads
-	//--------------------------------------------------------------------
-public:
-	// SUNSHINE CLEANUP no upload
-	void					requestUpload();
-	// SUNSHINE CLEANUP no upload
-	void					cancelUpload();
-	// SUNSHINE CLEANUP no upload
-	BOOL					uploadNeeded() const; 			// We need to upload a new texture
-	// SUNSHINE CLEANUP no upload
-	BOOL					uploadInProgress() const; 		// We have started uploading a new texture and are awaiting the result
-	// SUNSHINE CLEANUP no upload
-	BOOL					uploadPending() const; 			// We are expecting a new texture to be uploaded at some point
-	// SUNSHINE CLEANUP no upload
-	static void				onTextureUploadComplete(const LLUUID& uuid,
-													void* userdata,
-													S32 result, LLExtStat ext_status);
-protected:
-	// SUNSHINE CLEANUP no upload
-	BOOL					isReadyToUpload() const;
-	// SUNSHINE CLEANUP no upload
-	void					doUpload(); 					// Does a read back and upload.
-	// SUNSHINE CLEANUP no upload
-	void					conditionalRestartUploadTimer();
-private:
-	// SUNSHINE CLEANUP no upload
-	BOOL					mNeedsUpload; 					// Whether we need to send our baked textures to the server
-	// SUNSHINE CLEANUP no upload
-	U32						mNumLowresUploads; 				// Number of times we've sent a lowres version of our baked textures to the server
-	// SUNSHINE CLEANUP no upload
-	BOOL					mUploadPending; 				// Whether we have received back the new baked textures
-	// SUNSHINE CLEANUP no upload
-	LLUUID					mUploadID; 						// The current upload process (null if none).
-	// SUNSHINE CLEANUP no upload
-	LLFrameTimer    		mNeedsUploadTimer; 				// Tracks time since upload was requested and performed.
-	// SUNSHINE CLEANUP no upload
-	S32						mUploadFailCount;				// Number of consecutive upload failures
-	// SUNSHINE CLEANUP no upload
-	LLFrameTimer    		mUploadRetryTimer; 				// Tracks time since last upload failure.
-
-	//--------------------------------------------------------------------
 	// Updates
 	//--------------------------------------------------------------------
 public:
@@ -172,26 +129,5 @@ private:
 	LLFrameTimer    		mNeedsUpdateTimer; 				// Tracks time since update was requested and performed.
 };
 
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// LLBakedUploadData
-//
-// Used by LLTexLayerSetBuffer for a callback.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// SUNSHINE CLEANUP no upload
-struct LLBakedUploadData
-{
-	LLBakedUploadData(const LLVOAvatarSelf* avatar,
-					  LLViewerTexLayerSet* layerset, 
-					  const LLUUID& id,
-					  bool highest_res);
-	~LLBakedUploadData() {}
-	const LLUUID				mID;
-	const LLVOAvatarSelf*		mAvatar; // note: backlink only; don't LLPointer 
-	LLViewerTexLayerSet*		mTexLayerSet;
-   	const U64					mStartTime;	// for measuring baked texture upload time
-   	const bool					mIsHighestRes; // whether this is a "final" bake, or intermediate low res
-};
-
 #endif  // LL_VIEWER_TEXLAYER_H