diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-06-22 10:51:11 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-06-22 10:51:11 -0600 |
| commit | ab27913cc91dea2902fa5a271a35f14290d29c12 (patch) | |
| tree | bc46413bdddd93ff2abbbcab7ee355e998e4d94f /indra | |
| parent | e029683826623de6c112d6f50ead6e5d93cc98c9 (diff) | |
| parent | 32f8b474971d0d2fc029dda0d567ace6f9a750c1 (diff) | |
Automated merge with http://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 3 |
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(); |