diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-17 14:56:01 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-17 14:56:01 -0400 |
commit | f64a20ddcff91677b02b7688e08819cffb0989c9 (patch) | |
tree | 707b1430e5b7ef2e27f4f34c66822e92dfffd294 /indra/newview/llvocache.cpp | |
parent | c077250ff16aeaf0ec4c036154a427c677e85eb3 (diff) | |
parent | 17d87b0fa5bdd8d15dbcd98e65c30ebf4e5b94ec (diff) |
merge changes for storm-1016
Diffstat (limited to 'indra/newview/llvocache.cpp')
-rw-r--r-- | indra/newview/llvocache.cpp | 6 |
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; + } } |