summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-06-11 15:04:21 -0700
committerDessie Linden <dessie@lindenlab.com>2010-06-11 15:04:21 -0700
commit51c8c74da5a2675b5bdd016579f891f2729dfb54 (patch)
treed5779508e7bd196be0c342b35df72ae7643fb4c4 /indra/llrender
parenta21b7b330b65eebff050eb6c036745cac1578232 (diff)
parent8421c0096707969cc5dcf68f9ff7b8088a2ee325 (diff)
Merged from viewer-release
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llvertexbuffer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 4e94138746..ae43915a9d 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -819,7 +819,7 @@ BOOL LLVertexBuffer::useVBOs() const
return FALSE;
}
#endif
- return TRUE;
+ return sEnableVBOs;
}
//----------------------------------------------------------------------------
@@ -1183,7 +1183,7 @@ void LLVertexBuffer::setBuffer(U32 data_mask)
{
if (mGLBuffer)
{
- if (useVBOs() && sVBOActive)
+ if (sEnableVBOs && sVBOActive)
{
glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
sBindCount++;
@@ -1195,7 +1195,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)
{