diff options
| author | Palmer <palmer@lindenlab.com> | 2010-06-11 13:13:36 -0700 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-06-11 13:13:36 -0700 |
| commit | 173de446b78d6d9aeb934a0e09f9ad6022f64869 (patch) | |
| tree | 95aff8d94f6cd68d65f868feb444cf6c7866ab2f | |
| parent | 8c9587225a68f9b6276f08691d1a0ddbe67edd9a (diff) | |
| parent | 3bb98107a9fdb68ba2931fc01d5eaaac97494f75 (diff) | |
merge
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 76cd68e246..bf5eda21eb 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -813,7 +813,7 @@ BOOL LLVertexBuffer::useVBOs() const return FALSE; } #endif - return TRUE; + return sEnableVBOs; } //---------------------------------------------------------------------------- @@ -1177,7 +1177,7 @@ void LLVertexBuffer::setBuffer(U32 data_mask) { if (mGLBuffer) { - if (useVBOs() && sVBOActive) + if (sEnableVBOs && sVBOActive) { glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0); sBindCount++; @@ -1189,7 +1189,7 @@ void LLVertexBuffer::setBuffer(U32 data_mask) setup = TRUE; // ... or a client memory pointer changed } } - if (useVBOs() && mGLIndices && sIBOActive) + if (sEnableVBOs && mGLIndices && sIBOActive) { /*if (sMapped) { |