From a242129b571daa8c6137c79931e31f9d43422abc Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 8 Feb 2011 15:53:50 -0600
Subject: SH-523 Fix for non-finite values in silhouette rendering resulting in
 silhouette segments pointing at center of screen.

---
 indra/llmath/llvolume.cpp | 4 ----
 indra/llmath/llvolume.h   | 1 -
 2 files changed, 5 deletions(-)

(limited to 'indra/llmath')

diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 2f662b757b..c4be176353 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -4179,7 +4179,6 @@ S32 LLVolume::getNumTriangles() const
 //-----------------------------------------------------------------------------
 void LLVolume::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
 										  std::vector<LLVector3> &normals,
-										  std::vector<S32> &segments,
 										  const LLVector3& obj_cam_vec_in,
 										  const LLMatrix4& mat_in,
 										  const LLMatrix3& norm_mat_in,
@@ -4198,7 +4197,6 @@ void LLVolume::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
 
 	vertices.clear();
 	normals.clear();
-	segments.clear();
 
 	if ((mParams.getSculptType() & LL_SCULPT_TYPE_MASK) == LL_SCULPT_TYPE_MESH)
 	{
@@ -4399,8 +4397,6 @@ void LLVolume::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
 						norm_mat.rotate(n[v2], t);
 						t.normalize3fast();
 						normals.push_back(LLVector3(t[0], t[1], t[2]));
-
-						segments.push_back(vertices.size());
 					}
 				}		
 			}
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index 5bd65c2bf2..60b64b1285 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -986,7 +986,6 @@ public:
 
 	void generateSilhouetteVertices(std::vector<LLVector3> &vertices, 
 									std::vector<LLVector3> &normals, 
-									std::vector<S32> &segments, 
 									const LLVector3& view_vec,
 									const LLMatrix4& mat,
 									const LLMatrix3& norm_mat,
-- 
cgit v1.2.3