diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-19 13:51:35 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-19 13:51:35 +0000 |
| commit | 49b37a4dc362679e94fe04ff3cd7094f0e0e9f68 (patch) | |
| tree | 9832afd6820bc0122fb8eef0552bbfab58736492 /indra/newview/llspatialpartition.cpp | |
| parent | c3a71b7dcbfe855058a84e22651aea3910133aa1 (diff) | |
| parent | 8bafcc0491d0131a53226365f18b3ba68648a742 (diff) | |
merge from viewer2, conflicts resolved...
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 2a57d48f16..19bf40b56a 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -2294,7 +2294,6 @@ void pushVerts(LLFace* face, U32 mask) U16 offset = face->getIndicesStart(); buffer->drawRange(LLRender::TRIANGLES, start, end, count, offset); } - } void pushBufferVerts(LLVertexBuffer* buffer, U32 mask) @@ -3380,7 +3379,8 @@ LLDrawInfo::LLDrawInfo(U16 start, U16 end, U32 count, U32 offset, mVSize(0.f), mGroup(NULL), mFace(NULL), - mDistance(0.f) + mDistance(0.f), + mDrawMode(LLRender::TRIANGLES) { mDebugColor = (rand() << 16) + rand(); if (mStart >= mVertexBuffer->getRequestedVerts() || |