summaryrefslogtreecommitdiff
path: root/indra/newview/llvocache.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-15 09:26:58 -0400
committerOz Linden <oz@lindenlab.com>2011-03-15 09:26:58 -0400
commit6faa6236f520fd1dbbbbe030957a6354f5c45db3 (patch)
tree907614751c28c888ae7f5ea725a681b34b2f48f0 /indra/newview/llvocache.cpp
parent174b537953b5a39702c833ab1e83313a80e5e549 (diff)
parentae3e97024ec60d2c0555bf01ff6e2786232b6dd5 (diff)
merge changes for storm-28
Diffstat (limited to 'indra/newview/llvocache.cpp')
-rw-r--r--indra/newview/llvocache.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
index a933500706..b888a263d0 100644
--- a/indra/newview/llvocache.cpp
+++ b/indra/newview/llvocache.cpp
@@ -71,6 +71,7 @@ LLVOCacheEntry::LLVOCacheEntry()
}
LLVOCacheEntry::LLVOCacheEntry(LLAPRFile* apr_file)
+ : mBuffer(NULL)
{
S32 size = -1;
BOOL success;
@@ -135,7 +136,10 @@ LLVOCacheEntry::LLVOCacheEntry(LLAPRFile* apr_file)
LLVOCacheEntry::~LLVOCacheEntry()
{
- delete [] mBuffer;
+ if(mBuffer)
+ {
+ delete[] mBuffer;
+ }
}