diff options
Diffstat (limited to 'linden/indra/newview/llsprite.cpp')
-rw-r--r-- | linden/indra/newview/llsprite.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/linden/indra/newview/llsprite.cpp b/linden/indra/newview/llsprite.cpp index bb78f1a..092d49f 100644 --- a/linden/indra/newview/llsprite.cpp +++ b/linden/indra/newview/llsprite.cpp | |||
@@ -199,8 +199,8 @@ void LLSprite::updateFace(LLFace &face) | |||
199 | LLStrider<LLVector3> verticesp; | 199 | LLStrider<LLVector3> verticesp; |
200 | LLStrider<LLVector3> normalsp; | 200 | LLStrider<LLVector3> normalsp; |
201 | LLStrider<LLVector2> tex_coordsp; | 201 | LLStrider<LLVector2> tex_coordsp; |
202 | LLStrider<U32> indicesp; | 202 | LLStrider<U16> indicesp; |
203 | S32 index_offset; | 203 | U16 index_offset; |
204 | 204 | ||
205 | // Setup face | 205 | // Setup face |
206 | if (face.mVertexBuffer.isNull()) | 206 | if (face.mVertexBuffer.isNull()) |
@@ -214,10 +214,6 @@ void LLSprite::updateFace(LLFace &face) | |||
214 | } | 214 | } |
215 | 215 | ||
216 | index_offset = face.getGeometry(verticesp,normalsp,tex_coordsp, indicesp); | 216 | index_offset = face.getGeometry(verticesp,normalsp,tex_coordsp, indicesp); |
217 | if (-1 == index_offset) | ||
218 | { | ||
219 | return; | ||
220 | } | ||
221 | 217 | ||
222 | *tex_coordsp = LLVector2(0.f, 0.f); | 218 | *tex_coordsp = LLVector2(0.f, 0.f); |
223 | *verticesp = mC; | 219 | *verticesp = mC; |
@@ -263,7 +259,7 @@ void LLSprite::updateFace(LLFace &face) | |||
263 | *indicesp++ = 3 + index_offset; | 259 | *indicesp++ = 3 + index_offset; |
264 | } | 260 | } |
265 | 261 | ||
266 | //face.mVertexBuffer->setBuffer(0); | 262 | face.mVertexBuffer->setBuffer(0); |
267 | face.mCenterAgent = mPosition; | 263 | face.mCenterAgent = mPosition; |
268 | } | 264 | } |
269 | 265 | ||