From 42e592fdd429c1508200dc82126db0cc8d11e7ca Mon Sep 17 00:00:00 2001
From: Techwolf Lupindo <none@none>
Date: Mon, 14 Mar 2011 22:26:10 -0400
Subject: [PATCH] fix for STORM-1052: crash at
 LLVOCacheEntry::~LLVOCacheEntry() line 138 Early grab of crashfix before
 mergeing with upstream.

---
 indra/newview/llvocache.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
index c699385a08..789cad7163 100644
--- a/indra/newview/llvocache.cpp
+++ b/indra/newview/llvocache.cpp
@@ -70,6 +70,7 @@ LLVOCacheEntry::LLVOCacheEntry()
 }
 
 LLVOCacheEntry::LLVOCacheEntry(LLAPRFile* apr_file)
+	: mBuffer(NULL)
 {
 	S32 size = -1;
 	BOOL success;
@@ -134,7 +135,10 @@ LLVOCacheEntry::LLVOCacheEntry(LLAPRFile* apr_file)
 
 LLVOCacheEntry::~LLVOCacheEntry()
 {
-	delete [] mBuffer;
+	if(mBuffer)
+	{
+		delete[] mBuffer;
+	}
 }