summaryrefslogtreecommitdiff
path: root/indra/newview/llface.cpp
diff options
context:
space:
mode:
authorPalmer Truelson <palmer@lindenlab.com>2010-02-24 10:33:14 -0800
committerPalmer Truelson <palmer@lindenlab.com>2010-02-24 10:33:14 -0800
commit5ba0c01ae879215a703ce6e68bbf4f7bd8dd8207 (patch)
treebaf6070a52a8649706b055c360868c9ce14c1c59 /indra/newview/llface.cpp
parent469af6771d757dd951daaed3e2b1d59ee2127c0e (diff)
parent6575b685e91d334198789c88dec2efab7e5a1ac9 (diff)
merge with viewer 2 (fix windows build)
Diffstat (limited to 'indra/newview/llface.cpp')
-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 c40edb6511..770811b587 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1086,14 +1086,14 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
mVertexBuffer->getIndexStrider(indicesp, mIndicesIndex);
if (LLPipeline::sUseTriStrips)
{
- for (U32 i = 0; i < num_indices; i++)
+ for (U32 i = 0; i < (U32) num_indices; i++)
{
*indicesp++ = vf.mTriStrip[i] + index_offset;
}
}
else
{
- for (U32 i = 0; i < num_indices; i++)
+ for (U32 i = 0; i < (U32) num_indices; i++)
{
*indicesp++ = vf.mIndices[i] + index_offset;
}