diff options
| author | McCabe Maxsted | 2011-04-14 22:34:55 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-04-14 22:34:55 -0700 |
| commit | 562b0ab82bf929ef338374f5b71ba5a3a3f5c267 (patch) | |
| tree | 4ce99b45cdce56e8c94baad5580a04380a9f9bba | |
| parent | Added button for the full viewer to the minimap. Now need to think about the ... (diff) | |
| download | meta-impy-562b0ab82bf929ef338374f5b71ba5a3a3f5c267.zip meta-impy-562b0ab82bf929ef338374f5b71ba5a3a3f5c267.tar.gz meta-impy-562b0ab82bf929ef338374f5b71ba5a3a3f5c267.tar.bz2 meta-impy-562b0ab82bf929ef338374f5b71ba5a3a3f5c267.tar.xz | |
Applied lineSegmentIntersectFix from the Cool Viewer, backported from SG2
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llmath/llvolume.cpp | 2 | ||||
| -rw-r--r-- | linden/indra/newview/llvovolume.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp index c4c3f07..618048c 100644 --- a/linden/indra/llmath/llvolume.cpp +++ b/linden/indra/llmath/llvolume.cpp | |||
| @@ -3583,7 +3583,7 @@ S32 LLVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, | |||
| 3583 | if (face == -1) // ALL_SIDES | 3583 | if (face == -1) // ALL_SIDES |
| 3584 | { | 3584 | { |
| 3585 | start_face = 0; | 3585 | start_face = 0; |
| 3586 | end_face = getNumFaces() - 1; | 3586 | end_face = getNumVolumeFaces() - 1; |
| 3587 | } | 3587 | } |
| 3588 | else | 3588 | else |
| 3589 | { | 3589 | { |
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp index 8666e4a..4a53d4e 100644 --- a/linden/indra/newview/llvovolume.cpp +++ b/linden/indra/newview/llvovolume.cpp | |||
| @@ -2010,7 +2010,7 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e | |||
| 2010 | if (face == -1) | 2010 | if (face == -1) |
| 2011 | { | 2011 | { |
| 2012 | start_face = 0; | 2012 | start_face = 0; |
| 2013 | end_face = volume->getNumFaces(); | 2013 | end_face = volume->getNumVolumeFaces(); |
| 2014 | } | 2014 | } |
| 2015 | else | 2015 | else |
| 2016 | { | 2016 | { |