summaryrefslogtreecommitdiff
path: root/indra/llrender/llvertexbuffer.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-06-22 16:07:47 -0600
committerXiaohong Bao <bao@lindenlab.com>2011-06-22 16:07:47 -0600
commit97ef8e0ea0845d9fd88b733a6c8da13e0b095547 (patch)
treefd9639ec32f39eb2a0cf06be4256c14a3664e3c9 /indra/llrender/llvertexbuffer.cpp
parentb0fdc4495153523ff417334499ca466b0d8987c8 (diff)
parentab27913cc91dea2902fa5a271a35f14290d29c12 (diff)
Automated merge with http://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
-rw-r--r--indra/llrender/llvertexbuffer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 4a0b964e61..d5a7159ee3 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -240,7 +240,8 @@ void LLVertexBuffer::setupClientArrays(U32 data_mask)
void LLVertexBuffer::drawArrays(U32 mode, const std::vector<LLVector3>& pos, const std::vector<LLVector3>& norm)
{
U32 count = pos.size();
- llassert(norm.size() >= pos.size());
+ llassert_always(norm.size() >= pos.size());
+ llassert_always(count > 0) ;
unbind();