diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-12-10 17:01:17 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-12-10 17:01:17 -0700 |
| commit | 2237973792c927ccf7e46278c27252ffe8fc952b (patch) | |
| tree | 1b28e6462d16282d73ba7ce4722a081a6a14523c /indra/newview | |
| parent | 5ec1ecc314823f41bd2408293907b7670ff65981 (diff) | |
| parent | 558190f50c1a90b0d11b68b24f60bce482c6a6ec (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview')
| -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) |