summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-11 11:20:15 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-11 11:20:15 +0000
commit19962a783365784e3b820521e5854fdaf217133c (patch)
tree7431b19aa63a3bc2a096e9176ccd1f0237c0d527 /indra/newview
parentc62c145bedd5f3a53e6217bacd49e2b4872d8946 (diff)
parent38272c440dcdd3ade1d6aad97d94d8647558089c (diff)
merge.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llface.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index c902f7cb6b..23e0804407 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1085,14 +1085,14 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
mVertexBuffer->getIndexStrider(indicesp, mIndicesIndex);
if (LLPipeline::sUseTriStrips)
{
- for (U16 i = 0; i < num_indices; i++)
+ for (U32 i = 0; i < num_indices; i++)
{
*indicesp++ = vf.mTriStrip[i] + index_offset;
}
}
else
{
- for (U16 i = 0; i < num_indices; i++)
+ for (U32 i = 0; i < num_indices; i++)
{
*indicesp++ = vf.mIndices[i] + index_offset;
}