diff options
| author | callum <none@none> | 2009-12-14 14:10:16 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-12-14 14:10:16 -0800 |
| commit | 180daf3ab83ff9a83200c1952c0f09d20cfcb992 (patch) | |
| tree | 4591d743023244614678022269d80ef6d8097f63 /indra/newview/llviewertexture.cpp | |
| parent | 894a5006b3e5b4c725060443dab34491b0da3a4d (diff) | |
| parent | 5b6e4577ae6073650d78e1181ca5b60c527a7ae7 (diff) | |
Merge with Tip
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) |