diff options
author | Dave Parks <davep@lindenlab.com> | 2012-11-20 17:03:55 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-11-20 17:03:55 -0600 |
commit | 5d34ac552f3939626840b703b2da380663f25f49 (patch) | |
tree | ddeacd3365fed0ad193c053d39ebeb39451cc74a /indra/llmath/llvolume.h | |
parent | a830812172d7eb163c06ead3155dc4b43ded4346 (diff) | |
parent | 8db983fb8095f25873b8317fd1f4764abce4a31b (diff) |
Automated merge with https://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/llmath/llvolume.h')
-rw-r--r-- | indra/llmath/llvolume.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index 2e6f9e2f71..c845556557 100644 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -1023,17 +1023,6 @@ public: LLVector3* normal = NULL, LLVector3* bi_normal = NULL); - // The following cleans up vertices and triangles, - // getting rid of degenerate triangles and duplicate vertices, - // and allocates new arrays with the clean data. - static BOOL cleanupTriangleData( const S32 num_input_vertices, - const std::vector<Point> &input_vertices, - const S32 num_input_triangles, - S32 *input_triangles, - S32 &num_output_vertices, - LLVector3 **output_vertices, - S32 &num_output_triangles, - S32 **output_triangles); LLFaceID generateFaceMask(); BOOL isFaceMaskValid(LLFaceID face_mask); |