diff options
| author | leyla_linden <none@none> | 2011-02-08 15:01:02 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-02-08 15:01:02 -0800 |
| commit | b30bf98531b86a422a3b2f6098b351513d15a600 (patch) | |
| tree | 6bf9a23cfa0340375c567b8b34f24996224597c7 /indra/llmath | |
| parent | 9cd092544f6f4183af19132ed68111bd8d31a89f (diff) | |
| parent | f2af75d93af24d2cba311d2f083c19d42e94df3d (diff) | |
Merge
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llvolume.cpp | 4 | ||||
| -rw-r--r-- | indra/llmath/llvolume.h | 1 |
2 files changed, 0 insertions, 5 deletions
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, |