diff options
author | Jacek Antonelli | 2008-12-09 22:25:37 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-12-09 22:25:41 -0600 |
commit | 22b861982f2efd5d16097a012627e73b9fb85834 (patch) | |
tree | 6152a84b92c682e271bdd52d46cd1728454f679a /linden/indra/newview/llvovolume.cpp | |
parent | Second Life viewer sources 1.22.1-RC (diff) | |
download | meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.zip meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.gz meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.bz2 meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.xz |
Second Life viewer sources 1.22.2-RC
Diffstat (limited to 'linden/indra/newview/llvovolume.cpp')
-rw-r--r-- | linden/indra/newview/llvovolume.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp index 47289ff..a1ca61f 100644 --- a/linden/indra/newview/llvovolume.cpp +++ b/linden/indra/newview/llvovolume.cpp | |||
@@ -1998,7 +1998,7 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e | |||
1998 | face_hit = volume->lineSegmentIntersect(v_start, v_end, i, | 1998 | face_hit = volume->lineSegmentIntersect(v_start, v_end, i, |
1999 | &p, &tc, &n, &bn); | 1999 | &p, &tc, &n, &bn); |
2000 | 2000 | ||
2001 | if (face_hit >= 0) | 2001 | if (face_hit >= 0 && mDrawable->getNumFaces() > face_hit) |
2002 | { | 2002 | { |
2003 | LLFace* face = mDrawable->getFace(face_hit); | 2003 | LLFace* face = mDrawable->getFace(face_hit); |
2004 | if (pick_transparent || !face->getTexture() || face->getTexture()->getMask(face->surfaceToTexture(tc, p, n))) | 2004 | if (pick_transparent || !face->getTexture() || face->getTexture()->getMask(face->surfaceToTexture(tc, p, n))) |