diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2009-12-14 11:44:48 -0600 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2009-12-14 11:44:48 -0600 |
| commit | de38b58f37d6c7dadd4a5f15be519cb0bb230fc7 (patch) | |
| tree | fdfe34a8be0e2086c1e9407931af85f5f8c2fc39 /indra/newview/llviewertexture.cpp | |
| parent | fadfa09e6d3bbff9ebae0aabeacf26a83aae4ad7 (diff) | |
| parent | a9e409c7071ba74f01158aa7b876a1ad60161fc4 (diff) | |
Merging in latest viewer 2
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 6bd63a56e9..faf7a93281 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) |