diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-11 19:17:37 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-11 19:17:37 +0200 |
| commit | edcdaf27ceaf00cf075416ba196a25a89357a9d1 (patch) | |
| tree | 4aff9e3eb53689da75f6ef5e087ff54b6c3bcade /indra/newview/llviewertexture.cpp | |
| parent | e56dae206e4774e16003d1f404a6814fd81a04d3 (diff) | |
| parent | 5f0b2624bc40c6c7580fa7c02f137c3dee330b94 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 0d29efaedf..a5a40e9c2c 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -2879,7 +2879,8 @@ BOOL LLViewerMediaTexture::findFaces() } S32 face_id = -1 ; - while((face_id = obj->getFaceIndexWithMediaImpl(mMediaImplp, face_id)) > -1) + S32 num_faces = obj->mDrawable->getNumFaces() ; + while((face_id = obj->getFaceIndexWithMediaImpl(mMediaImplp, face_id)) > -1 && face_id < num_faces) { LLFace* facep = obj->mDrawable->getFace(face_id) ; if(facep) |