MAINT-616 Fix for crash on shutdown caused by previous changes.

1 files changed, 9 insertions, 6 deletions

diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 6a218e7734..0e037fdd21 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -142,16 +142,19 @@ U32 LLVBOPool::genBuffer()
 
 void LLVBOPool::deleteBuffer(U32 name)
 {
-	LLVertexBuffer::unbind();
+	if (gGLManager.mInited)
+	{
+		LLVertexBuffer::unbind();
 
-	glBindBufferARB(mType, name);
-	glBufferDataARB(mType, 0, NULL, mUsage);
+		glBindBufferARB(mType, name);
+		glBufferDataARB(mType, 0, NULL, mUsage);
 
-	llassert(std::find(mGLNamePool.begin(), mGLNamePool.end(), name) == mGLNamePool.end());
+		llassert(std::find(mGLNamePool.begin(), mGLNamePool.end(), name) == mGLNamePool.end());
 
-	mGLNamePool.push_back(name);
+		mGLNamePool.push_back(name);
 
-	LLVertexBuffer::unbind();
+		LLVertexBuffer::unbind();
+	}
 }