summaryrefslogtreecommitdiff
path: root/indra/llmath/v3math.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-01 17:39:08 -0400
committerOz Linden <oz@lindenlab.com>2011-04-01 17:39:08 -0400
commit1664c9dc678f7aca9c2bbf38d28e00550e03c4dd (patch)
tree9a51b54cd3a500e066c25e2c6180dd343ec639d9 /indra/llmath/v3math.h
parent2deea7c9d162b9bcae29e73fca8eebd26460fbf8 (diff)
parentf12d79907c7f002666291ab23dbb01ba715fa2c1 (diff)
merge out end-of-develop.py tag from viewer-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 ef002fe9f2..4b3efe7394 100644
--- a/indra/llmath/v3math.h
+++ b/indra/llmath/v3math.h
@@ -69,6 +69,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