summaryrefslogtreecommitdiff
path: root/indra/llmessage/llxfer_vfile.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-09-12 06:27:13 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-09-12 06:27:13 +0000
commitda94c0eaa2ce2711f0ae26968e87ef3e409126a9 (patch)
treee0b23896f17e0a0ea60160b2c7e39331f3cb9668 /indra/llmessage/llxfer_vfile.cpp
parent642cdd95726755b7c24c7f2b25e2fea8e49b5b9b (diff)
QAR-855 Viewer 1.21 RC 2
merge viewer_1-21 94770-96059 -> release
Diffstat (limited to 'indra/llmessage/llxfer_vfile.cpp')
-rw-r--r--indra/llmessage/llxfer_vfile.cpp6
1 files changed, 3 insertions, 3 deletions
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();
}
///////////////////////////////////////////////////////////