fix an exit crash.

meow-7.2.2
Xiaohong Bao 2011-02-23 20:11:01 -07:00
parent 844bf22d25
commit ae65347e33
2 changed files with 6 additions and 3 deletions

View File

@ -800,6 +800,7 @@ void LLRender::shutdown()
mTexUnits.clear();
delete mDummyTexUnit;
mDummyTexUnit = NULL;
mBuffer = NULL ;
}
void LLRender::refreshState(void)

View File

@ -1877,9 +1877,7 @@ void LLViewerWindow::shutdownGL()
llinfos << "All textures and llimagegl images are destroyed!" << llendl ;
llinfos << "Cleaning up select manager" << llendl;
LLSelectMgr::getInstance()->cleanup();
LLVertexBuffer::cleanupClass();
LLSelectMgr::getInstance()->cleanup();
llinfos << "Stopping GL during shutdown" << llendl;
if (!gNoRender)
@ -1889,6 +1887,10 @@ void LLViewerWindow::shutdownGL()
}
gGL.shutdown();
LLVertexBuffer::cleanupClass();
llinfos << "LLVertexBuffer cleaned." << llendl ;
}
// shutdownViews() and shutdownGL() need to be called first