summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorbea@american.lindenlab.com <bea@american.lindenlab.com>2009-12-03 08:48:47 -0800
committerbea@american.lindenlab.com <bea@american.lindenlab.com>2009-12-03 08:48:47 -0800
commitdb4ea92fa8fb3a0c20194824ecd59f9ef0d8b5f2 (patch)
tree2075c07e8aec0650c4e818e508a49a0779354893 /indra/newview
parent1973cdc4e622621e8e034f083794e922a1f387f4 (diff)
parent9ad99e17734f1898071ec68ed11617f48701eb28 (diff)
merge
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llvovolume.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 367912f45e..cf61994fea 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1137,7 +1137,7 @@ void LLVOVolume::regenFaces()
// If the face had media on it, this will have broken the link between the LLViewerMediaTexture and the face.
// Re-establish the link.
- if(mMediaImplList.size() > i)
+ if((int)mMediaImplList.size() > i)
{
if(mMediaImplList[i])
{