From 80a8bab2a9dd8e77262b001af973212a6cba4a5a Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 12 Sep 2008 14:59:33 -0500
Subject: Second Life viewer sources 1.21.2-RC

---
 linden/indra/llrender/llrender.cpp | 6 ++++++
 linden/indra/llrender/llrender.h   | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'linden/indra/llrender')

diff --git a/linden/indra/llrender/llrender.cpp b/linden/indra/llrender/llrender.cpp
index 13edf8a..7be06af 100644
--- a/linden/indra/llrender/llrender.cpp
+++ b/linden/indra/llrender/llrender.cpp
@@ -439,10 +439,16 @@ LLRender::LLRender()
 
 LLRender::~LLRender()
 {
+	shutdown();
+}
+
+void LLRender::shutdown()
+{
 	for (U32 i = 0; i < mTexUnits.size(); i++)
 	{
 		delete mTexUnits[i];
 	}
+	mTexUnits.clear();
 }
 
 void LLRender::translatef(const GLfloat& x, const GLfloat& y, const GLfloat& z)
diff --git a/linden/indra/llrender/llrender.h b/linden/indra/llrender/llrender.h
index edf46ff..15360a3 100644
--- a/linden/indra/llrender/llrender.h
+++ b/linden/indra/llrender/llrender.h
@@ -176,7 +176,8 @@ public:
 
 	LLRender();
 	~LLRender();
-
+	void shutdown();
+	
 	void translatef(const GLfloat& x, const GLfloat& y, const GLfloat& z);
 	void scalef(const GLfloat& x, const GLfloat& y, const GLfloat& z);
 	void pushMatrix();
-- 
cgit v1.1