diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/newview/llsprite.cpp | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/newview/llsprite.cpp')
| -rw-r--r-- | indra/newview/llsprite.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/llsprite.cpp b/indra/newview/llsprite.cpp index 827493d1b5..92fcbb6e6c 100644 --- a/indra/newview/llsprite.cpp +++ b/indra/newview/llsprite.cpp @@ -199,8 +199,8 @@ void LLSprite::updateFace(LLFace &face) LLStrider<LLVector3> verticesp; LLStrider<LLVector3> normalsp; LLStrider<LLVector2> tex_coordsp; - LLStrider<U32> indicesp; - S32 index_offset; + LLStrider<U16> indicesp; + U16 index_offset; // Setup face if (face.mVertexBuffer.isNull()) @@ -214,10 +214,6 @@ void LLSprite::updateFace(LLFace &face) } index_offset = face.getGeometry(verticesp,normalsp,tex_coordsp, indicesp); - if (-1 == index_offset) - { - return; - } *tex_coordsp = LLVector2(0.f, 0.f); *verticesp = mC; @@ -263,7 +259,7 @@ void LLSprite::updateFace(LLFace &face) *indicesp++ = 3 + index_offset; } - //face.mVertexBuffer->setBuffer(0); + face.mVertexBuffer->setBuffer(0); face.mCenterAgent = mPosition; } |