diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-06-24 11:44:48 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-06-24 11:44:48 -0600 |
| commit | c3ac5be99521979a9cb4395abf729bbbb59e5d49 (patch) | |
| tree | 1338855937445684ad7c7bd4192b9892a890817d /indra | |
| parent | 887516ca4ca6db33a655ab67d15bac8f2e014db1 (diff) | |
| parent | 97ef8e0ea0845d9fd88b733a6c8da13e0b095547 (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(); |