QAR-855 Viewer 1.21 RC 2

merge viewer_1-21 94770-96059 -> release

14 files changed, 21 insertions, 45 deletions

diff --git a/indra/llmessage/llpacketbuffer.cpp b/indra/llmessage/llpacketbuffer.cpp
index cb71fcd773..f264e8f495 100644
--- a/indra/llmessage/llpacketbuffer.cpp
+++ b/indra/llmessage/llpacketbuffer.cpp
@@ -65,7 +65,6 @@ LLPacketBuffer::LLPacketBuffer (S32 hSocket)
 
 LLPacketBuffer::~LLPacketBuffer ()
 {
-	free();
 }
 
 ///////////////////////////////////////////////////////////
@@ -76,25 +75,3 @@ void LLPacketBuffer::init (S32 hSocket)
 	mHost = ::get_sender();
 }
 	
-///////////////////////////////////////////////////////////
-
-void LLPacketBuffer::free ()
-{
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/indra/llmessage/llpacketbuffer.h b/indra/llmessage/llpacketbuffer.h
index 1e57517f29..9308202f1b 100644
--- a/indra/llmessage/llpacketbuffer.h
+++ b/indra/llmessage/llpacketbuffer.h
@@ -47,7 +47,6 @@ public:
 	const char	*getData() const	{ return mData; }
 	LLHost		getHost() const		{ return mHost; }
 	void init(S32 hSocket);
-	void free();
 
 protected:
 	char	mData[NET_BUFFER_SIZE];        // packet data		/* Flawfinder : ignore */
diff --git a/indra/llmessage/llpacketring.cpp b/indra/llmessage/llpacketring.cpp
index 48a02fede5..646d1865ea 100644
--- a/indra/llmessage/llpacketring.cpp
+++ b/indra/llmessage/llpacketring.cpp
@@ -59,11 +59,11 @@ LLPacketRing::LLPacketRing () :
 ///////////////////////////////////////////////////////////
 LLPacketRing::~LLPacketRing ()
 {
-	free();
+	cleanup();
 }
 	
 ///////////////////////////////////////////////////////////
-void LLPacketRing::free ()
+void LLPacketRing::cleanup ()
 {
 	LLPacketBuffer *packetp;
 
diff --git a/indra/llmessage/llpacketring.h b/indra/llmessage/llpacketring.h
index 0e1450ac1b..20aea5950d 100644
--- a/indra/llmessage/llpacketring.h
+++ b/indra/llmessage/llpacketring.h
@@ -47,7 +47,7 @@ public:
 	LLPacketRing();         
     ~LLPacketRing();
 
-	void free();
+	void cleanup();
 
 	void dropPackets(U32);	
 	void setDropPercentage (F32 percent_to_drop);
diff --git a/indra/llmessage/llxfer.cpp b/indra/llmessage/llxfer.cpp
index 5682b1c454..8091184fda 100644
--- a/indra/llmessage/llxfer.cpp
+++ b/indra/llmessage/llxfer.cpp
@@ -55,7 +55,7 @@ LLXfer::LLXfer (S32 chunk_size)
 
 LLXfer::~LLXfer ()
 {
-	free();
+	cleanup();
 }
 
 ///////////////////////////////////////////////////////////
@@ -90,7 +90,7 @@ void LLXfer::init (S32 chunk_size)
 	
 ///////////////////////////////////////////////////////////
 
-void LLXfer::free ()
+void LLXfer::cleanup ()
 {
 	if (mBuffer)
 	{
diff --git a/indra/llmessage/llxfer.h b/indra/llmessage/llxfer.h
index 57abc28960..9a8696e143 100644
--- a/indra/llmessage/llxfer.h
+++ b/indra/llmessage/llxfer.h
@@ -88,7 +88,7 @@ class LLXfer
 	virtual ~LLXfer();
 
 	void init(S32 chunk_size);
-	virtual void free();
+	virtual void cleanup();
 
 	virtual S32 startSend (U64 xfer_id, const LLHost &remote_host);
 	virtual void sendPacket(S32 packet_num);
diff --git a/indra/llmessage/llxfer_file.cpp b/indra/llmessage/llxfer_file.cpp
index 3643c4880d..4926311adb 100644
--- a/indra/llmessage/llxfer_file.cpp
+++ b/indra/llmessage/llxfer_file.cpp
@@ -67,7 +67,7 @@ LLXfer_File::LLXfer_File (const std::string& local_filename, BOOL delete_local_o
 
 LLXfer_File::~LLXfer_File ()
 {
-	free();
+	cleanup();
 }
 
 ///////////////////////////////////////////////////////////
@@ -95,7 +95,7 @@ void LLXfer_File::init (const std::string& local_filename, BOOL delete_local_on_
 	
 ///////////////////////////////////////////////////////////
 
-void LLXfer_File::free ()
+void LLXfer_File::cleanup ()
 {
 	if (mFp)
 	{
@@ -115,7 +115,7 @@ void LLXfer_File::free ()
 		lldebugs << "Keeping local file: " << mLocalFilename << llendl;
 	}
 
-	LLXfer::free();
+	LLXfer::cleanup();
 }
 
 ///////////////////////////////////////////////////////////
diff --git a/indra/llmessage/llxfer_file.h b/indra/llmessage/llxfer_file.h
index 04336c75fe..8fdfd5e71f 100644
--- a/indra/llmessage/llxfer_file.h
+++ b/indra/llmessage/llxfer_file.h
@@ -53,7 +53,7 @@ class LLXfer_File : public LLXfer
 	virtual ~LLXfer_File();
 
 	virtual void init(const std::string& local_filename, BOOL delete_local_on_completion, S32 chunk_size);
-	virtual void free();
+	virtual void cleanup();
 
 	virtual S32 initializeRequest(U64 xfer_id,
 								  const std::string& local_filename,
diff --git a/indra/llmessage/llxfer_mem.cpp b/indra/llmessage/llxfer_mem.cpp
index dbaa3aebed..20b3db3e0b 100644
--- a/indra/llmessage/llxfer_mem.cpp
+++ b/indra/llmessage/llxfer_mem.cpp
@@ -48,7 +48,7 @@ LLXfer_Mem::LLXfer_Mem ()
 
 LLXfer_Mem::~LLXfer_Mem ()
 {
-	free();
+	cleanup();
 }
 
 ///////////////////////////////////////////////////////////
@@ -62,9 +62,9 @@ void LLXfer_Mem::init ()
 	
 ///////////////////////////////////////////////////////////
 
-void LLXfer_Mem::free ()
+void LLXfer_Mem::cleanup ()
 {
-	LLXfer::free();
+	LLXfer::cleanup();
 }
 
 ///////////////////////////////////////////////////////////
diff --git a/indra/llmessage/llxfer_mem.h b/indra/llmessage/llxfer_mem.h
index a6b95c0fcf..c251348553 100644
--- a/indra/llmessage/llxfer_mem.h
+++ b/indra/llmessage/llxfer_mem.h
@@ -55,7 +55,7 @@ class LLXfer_Mem : public LLXfer
 	virtual ~LLXfer_Mem();
 
 	virtual void init();
-	virtual void free();
+	virtual void cleanup();
 
 	virtual S32 startSend (U64 xfer_id, const LLHost &remote_host);
 	virtual U64 registerXfer(U64 xfer_id, const void *datap, const S32 length);
diff --git a/indra/llmessage/llxfer_vfile.cpp b/indra/llmessage/llxfer_vfile.cpp
index 6dd683043b..aff1636290 100644
--- a/indra/llmessage/llxfer_vfile.cpp
+++ b/indra/llmessage/llxfer_vfile.cpp
@@ -60,7 +60,7 @@ LLXfer_VFile::LLXfer_VFile (LLVFS *vfs, const LLUUID &local_id, LLAssetType::ETy
 
 LLXfer_VFile::~LLXfer_VFile ()
 {
-	free();
+	cleanup();
 }
 
 ///////////////////////////////////////////////////////////
@@ -82,7 +82,7 @@ void LLXfer_VFile::init (LLVFS *vfs, const LLUUID &local_id, LLAssetType::EType
 	
 ///////////////////////////////////////////////////////////
 
-void LLXfer_VFile::free ()
+void LLXfer_VFile::cleanup ()
 {
 	LLVFile file(mVFS, mTempID, mType, LLVFile::WRITE);
 	file.remove();
@@ -90,7 +90,7 @@ void LLXfer_VFile::free ()
 	delete mVFile;
 	mVFile = NULL;
 
-	LLXfer::free();
+	LLXfer::cleanup();
 }
 
 ///////////////////////////////////////////////////////////
diff --git a/indra/llmessage/llxfer_vfile.h b/indra/llmessage/llxfer_vfile.h
index 84457edf26..c883d27854 100644
--- a/indra/llmessage/llxfer_vfile.h
+++ b/indra/llmessage/llxfer_vfile.h
@@ -58,7 +58,7 @@ class LLXfer_VFile : public LLXfer
 	virtual ~LLXfer_VFile();
 
 	virtual void init(LLVFS *vfs, const LLUUID &local_id, LLAssetType::EType type);
-	virtual void free();
+	virtual void cleanup();
 
 	virtual S32 initializeRequest(U64 xfer_id,
 			LLVFS *vfs,
diff --git a/indra/llmessage/llxfermanager.cpp b/indra/llmessage/llxfermanager.cpp
index 7f05404636..2afb9845c0 100644
--- a/indra/llmessage/llxfermanager.cpp
+++ b/indra/llmessage/llxfermanager.cpp
@@ -64,7 +64,7 @@ LLXferManager::LLXferManager (LLVFS *vfs)
 
 LLXferManager::~LLXferManager ()
 {
-	free();
+	cleanup();
 }
 
 ///////////////////////////////////////////////////////////
@@ -86,7 +86,7 @@ void LLXferManager::init (LLVFS *vfs)
 	
 ///////////////////////////////////////////////////////////
 
-void LLXferManager::free ()
+void LLXferManager::cleanup ()
 {
 	LLXfer *xferp;
 	LLXfer *delp;
diff --git a/indra/llmessage/llxfermanager.h b/indra/llmessage/llxfermanager.h
index dff8181584..1a3e37102f 100644
--- a/indra/llmessage/llxfermanager.h
+++ b/indra/llmessage/llxfermanager.h
@@ -114,7 +114,7 @@ class LLXferManager
 	virtual ~LLXferManager();
 
 	virtual void init(LLVFS *vfs);
-	virtual void free();
+	virtual void cleanup();
 
 	void setUseAckThrottling(const BOOL use);
 	void setAckThrottleBPS(const F32 bps);