summaryrefslogtreecommitdiff
path: root/indra/llmath/v3math.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-04-04 10:42:52 -0400
committerLoren Shih <seraph@lindenlab.com>2011-04-04 10:42:52 -0400
commit47781184fc50f6e9e0842c2d7fa7632038a279df (patch)
tree83522faadf17895565c38d89064aff6da51a1006 /indra/llmath/v3math.h
parent0dd0758ab9114c53a274ff707d626c8fe5e7afb0 (diff)
parent3c6a09372da395a621fb35db4934af2c7c21e910 (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/llmath/v3math.h')
-rw-r--r--indra/llmath/v3math.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llmath/v3math.h b/indra/llmath/v3math.h
index acb2240075..0432aeba4c 100644
--- a/indra/llmath/v3math.h
+++ b/indra/llmath/v3math.h
@@ -70,6 +70,7 @@ class LLVector3
inline BOOL isFinite() const; // checks to see if all values of LLVector3 are finite
BOOL clamp(F32 min, F32 max); // Clamps all values to (min,max), returns TRUE if data changed
+ BOOL clamp(const LLVector3 &min_vec, const LLVector3 &max_vec); // Scales vector by another vector
BOOL clampLength( F32 length_limit ); // Scales vector to limit length to a value
void quantize16(F32 lowerxy, F32 upperxy, F32 lowerz, F32 upperz); // changes the vector to reflect quatization