Second Life viewer sources 1.21.2-RC

2 files changed, 8 insertions, 1 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)
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();