1 files changed, 6 insertions, 0 deletions

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)