diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-18 19:56:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-18 19:56:37 -0400 |
| commit | 85ccab2d8178c508e585f987bb076951bf2e9ddb (patch) | |
| tree | 5fbdf54372657c2c9353d274cd81f62b1e4fdf02 /indra/newview/llvocache.cpp | |
| parent | 9f2a04f217d54344360edc554456d9804e17eeb7 (diff) | |
| parent | 6ef593580239df7b967cca59d4cfa9fcd8db6aec (diff) | |
Automated merge with file:///Users/oz/Work/viewer-vs2010
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; + } } |