summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-10-15 14:23:29 -0700
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-10-15 14:23:29 -0700
commitd6e3b0445a49d0fb10ca9e6cb668c65984ce1866 (patch)
treee12511d8f64e0ec42c2d6abb4ed4efa5f7853a83 /indra/llrender
parent9b7bfcf594a8388eae087886c53ead164251c62e (diff)
parent1709952adbb3ad3ba4eb7d5be39c0c67c389c7c5 (diff)
Merge in viewer-development code and fix build
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llvertexbuffer.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 11b2681e52..e005abeef9 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -290,7 +290,6 @@ void LLVBOPool::seedPool()
-
void LLVBOPool::cleanup()
{
U32 size = LL_VBO_BLOCK_SIZE;