14 files changed, 21 insertions, 45 deletions

diff --git a/linden/indra/llmessage/llpacketbuffer.cpp b/linden/indra/llmessage/llpacketbuffer.cpp
index 129965e..649cdb6 100644
--- a/linden/indra/llmessage/llpacketbuffer.cpp
+++ b/linden/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/linden/indra/llmessage/llpacketbuffer.h b/linden/indra/llmessage/llpacketbuffer.h
index f1c343b..fc6f606 100644
--- a/linden/indra/llmessage/llpacketbuffer.h
+++ b/linden/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/linden/indra/llmessage/llpacketring.cpp b/linden/indra/llmessage/llpacketring.cpp
index 12d4e11..2d517af 100644
--- a/linden/indra/llmessage/llpacketring.cpp
+++ b/linden/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/linden/indra/llmessage/llpacketring.h b/linden/indra/llmessage/llpacketring.h
index dac52e6..8d3bf8d 100644
--- a/linden/indra/llmessage/llpacketring.h
+++ b/linden/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/linden/indra/llmessage/llxfer.cpp b/linden/indra/llmessage/llxfer.cpp
index ab7b1ee..03bc42c 100644
--- a/linden/indra/llmessage/llxfer.cpp
+++ b/linden/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/linden/indra/llmessage/llxfer.h b/linden/indra/llmessage/llxfer.h
index 259f1ac..bd82300 100644
--- a/linden/indra/llmessage/llxfer.h
+++ b/linden/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/linden/indra/llmessage/llxfer_file.cpp b/linden/indra/llmessage/llxfer_file.cpp
index da12d54..c56ea98 100644
--- a/linden/indra/llmessage/llxfer_file.cpp
+++ b/linden/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/linden/indra/llmessage/llxfer_file.h b/linden/indra/llmessage/llxfer_file.h
index 78f77a8..09b3228 100644
--- a/linden/indra/llmessage/llxfer_file.h
+++ b/linden/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/linden/indra/llmessage/llxfer_mem.cpp b/linden/indra/llmessage/llxfer_mem.cpp
index 3404520..0b8c5b1 100644
--- a/linden/indra/llmessage/llxfer_mem.cpp
+++ b/linden/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/linden/indra/llmessage/llxfer_mem.h b/linden/indra/llmessage/llxfer_mem.h
index 0e67a06..cb2dd88 100644
--- a/linden/indra/llmessage/llxfer_mem.h
+++ b/linden/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/linden/indra/llmessage/llxfer_vfile.cpp b/linden/indra/llmessage/llxfer_vfile.cpp
index aede763..a92c434 100644
--- a/linden/indra/llmessage/llxfer_vfile.cpp
+++ b/linden/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/linden/indra/llmessage/llxfer_vfile.h b/linden/indra/llmessage/llxfer_vfile.h
index 12d38ba..e7e1981 100644
--- a/linden/indra/llmessage/llxfer_vfile.h
+++ b/linden/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/linden/indra/llmessage/llxfermanager.cpp b/linden/indra/llmessage/llxfermanager.cpp
index 90188b6..f40612c 100644
--- a/linden/indra/llmessage/llxfermanager.cpp
+++ b/linden/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/linden/indra/llmessage/llxfermanager.h b/linden/indra/llmessage/llxfermanager.h
index 12b3ec0..77f3f60 100644
--- a/linden/indra/llmessage/llxfermanager.h
+++ b/linden/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);