summaryrefslogtreecommitdiff
path: root/indra/llmath/v3math.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-14 22:59:36 -0500
committerOz Linden <oz@lindenlab.com>2010-12-14 22:59:36 -0500
commitad991346683c9e69d3e86b0e98275cb3fa47fb72 (patch)
tree371029c497c6453734771abc0eebb8755b841ad8 /indra/llmath/v3math.h
parent2027ce56a217b97848f5582a14f8ed81593a1f54 (diff)
parentefa42a6aab6d3ada198072c0e2be2b7d9b4e1eb5 (diff)
Automated merge with file:///Users/oz/Work/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 dbd38c1c3f..d3fc6fcb2f 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