diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-11 13:37:00 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-11 13:37:00 -0500 |
| commit | f042f35381f961e5648c239ae9dbf4b40941e96e (patch) | |
| tree | b713281f53c9c0e291b996731684b41e3b3bc1c5 /indra/newview/llviewertexture.cpp | |
| parent | ea3b99614327404f15f8c0cf98ae6d61bdd4572b (diff) | |
| parent | c74d5c483cbd75c5e2a0b17c8980755a9932c53a (diff) | |
Merge of viewer2 into avp branch
--HG--
branch : avatar-pipeline
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) |