diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-11 16:01:44 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-11 16:01:44 -0500 |
| commit | 99590047eb322d76a90c417bf0e6b2ec0e189d52 (patch) | |
| tree | eaab40ba586d097bf5c1dd4b6ef673c1284ff477 /indra/newview/llviewertexture.cpp | |
| parent | d2b72fe0184fb92f4a79eebd242825fbcc5f32e9 (diff) | |
| parent | 1f3a55470919bf451f9c45b454d9bbf815a3e88a (diff) | |
automated merge avp->avp
--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) |