summaryrefslogtreecommitdiff
path: root/indra/llmath/m4math.h
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-12-07 16:03:56 -0800
committerPalmer <palmer@lindenlab.com>2009-12-07 16:03:56 -0800
commit85488f54148b2dba02eadcbd50ccbb552638c3c7 (patch)
treedbb248900527cac25c307970fb5c817b90b715e7 /indra/llmath/m4math.h
parentee159d8e742a7281f304fc45b692c111706d294e (diff)
parent9d3968bb837828568bf58113b8315c8ca2e8dae1 (diff)
Merge of viewer 2 changes
Diffstat (limited to 'indra/llmath/m4math.h')
-rw-r--r--indra/llmath/m4math.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llmath/m4math.h b/indra/llmath/m4math.h
index e74b7afe9b..de981b7646 100644
--- a/indra/llmath/m4math.h
+++ b/indra/llmath/m4math.h
@@ -159,6 +159,7 @@ public:
const LLMatrix4& initRotTrans(const F32 roll, const F32 pitch, const F32 yaw, const LLVector4 &pos); // Rotation from Euler + translation
const LLMatrix4& initRotTrans(const LLQuaternion &q, const LLVector4 &pos); // Set with Quaternion and position
+ const LLMatrix4& initScale(const LLVector3 &scale);
// Set all
const LLMatrix4& initAll(const LLVector3 &scale, const LLQuaternion &q, const LLVector3 &pos);