summaryrefslogtreecommitdiff
path: root/indra/newview/llvocache.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-03-10 13:32:22 -0500
committerLoren Shih <seraph@lindenlab.com>2011-03-10 13:32:22 -0500
commit250cc9c956021ce2cb8b56bae30cd01184807b7b (patch)
tree7e02fe8d47e4af6c51fd47bd5800c3ed3b38551d /indra/newview/llvocache.cpp
parentfb00d280403b2befd645b8a80c3d9a3183e4c02c (diff)
parent0c02401498521f87d38778df0e795960aa5445e1 (diff)
Automated merge up from viewer-development into mesh-development
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 add1db9099..1f9be20c75 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;
+ }
}