diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-11-08 18:59:20 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-11-08 18:59:20 +0000 |
| commit | 760f2ceb1518d87e865f25ac87a540625e974517 (patch) | |
| tree | 0367941c9719c9d97f70a7c33094dcdeeea60224 /indra/llmath/llvolume.cpp | |
| parent | 0771e39d20ee1475b8bf1458ef87e2b82aaa4e02 (diff) | |
svn merge -r 72877:73187 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release
Backport patches and translations from RC branch
Diffstat (limited to 'indra/llmath/llvolume.cpp')
| -rw-r--r-- | indra/llmath/llvolume.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 9cad612f24..4dea08505d 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -1894,11 +1894,10 @@ void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, // compute the area of the parallelogram by taking the length of the cross product: // (parallegram is an approximation of two triangles) LLVector3 cross = (p1 - p2) % (p1 - p3); - // take length squared for efficiency (no sqrt) - area += cross.magVecSquared(); + area += cross.magVec(); } - if (area < SCULPT_MIN_AREA * SCULPT_MIN_AREA) + if (area < SCULPT_MIN_AREA) data_is_empty = TRUE; } |