diff options
Diffstat (limited to 'linden/indra/llmath')
-rw-r--r-- | linden/indra/llmath/llvolume.cpp | 2 | ||||
-rw-r--r-- | linden/indra/llmath/llvolume.h | 4 |
2 files changed, 4 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/llmath/llvolume.h b/linden/indra/llmath/llvolume.h index 0b9002f..77af2c4 100644 --- a/linden/indra/llmath/llvolume.h +++ b/linden/indra/llmath/llvolume.h | |||
@@ -949,9 +949,11 @@ public: | |||
949 | LLVector3 mLODScaleBias; // vector for biasing LOD based on scale | 949 | LLVector3 mLODScaleBias; // vector for biasing LOD based on scale |
950 | 950 | ||
951 | void sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, S32 sculpt_level); | 951 | void sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, S32 sculpt_level); |
952 | |||
953 | F32 sculptGetSurfaceArea(); | ||
954 | |||
952 | private: | 955 | private: |
953 | void sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, U8 sculpt_type); | 956 | void sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, U8 sculpt_type); |
954 | F32 sculptGetSurfaceArea(); | ||
955 | void sculptGeneratePlaceholder(); | 957 | void sculptGeneratePlaceholder(); |
956 | void sculptCalcMeshResolution(U16 width, U16 height, U8 type, S32& s, S32& t); | 958 | void sculptCalcMeshResolution(U16 width, U16 height, U8 type, S32& s, S32& t); |
957 | 959 | ||