diff -r 767feb16f05f -r 781a5ad220e3 indra/llrender/llvertexbuffer.cpp --- a/indra/llrender/llvertexbuffer.cpp Fri Feb 25 15:44:38 2011 -0800 +++ b/indra/llrender/llvertexbuffer.cpp Mon Mar 07 15:02:48 2011 -0700 @@ -310,7 +310,18 @@ //static void LLVertexBuffer::initClass(bool use_vbo, bool no_vbo_mapping) { - sEnableVBOs = use_vbo; + sEnableVBOs = use_vbo && gGLManager.mHasVertexBufferObject ; + if(sEnableVBOs) + { + llassert_always(glBindBufferARB) ; //double check the extention for VBO is loaded. + + llinfos << "VBO is enabled." << llendl ; + } + else + { + llinfos << "VBO is disabled." << llendl ; + } + sDisableVBOMapping = sEnableVBOs && no_vbo_mapping ; LLGLNamePool::registerPool(&sDynamicVBOPool); LLGLNamePool::registerPool(&sDynamicIBOPool);