diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-19 13:51:35 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-19 13:51:35 +0000 |
| commit | 49b37a4dc362679e94fe04ff3cd7094f0e0e9f68 (patch) | |
| tree | 9832afd6820bc0122fb8eef0552bbfab58736492 /indra/llmath/m4math.h | |
| parent | c3a71b7dcbfe855058a84e22651aea3910133aa1 (diff) | |
| parent | 8bafcc0491d0131a53226365f18b3ba68648a742 (diff) | |
merge from viewer2, conflicts resolved...
Diffstat (limited to 'indra/llmath/m4math.h')
| -rw-r--r-- | indra/llmath/m4math.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llmath/m4math.h b/indra/llmath/m4math.h index e74b7afe9b..6007b96bd9 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); @@ -236,6 +237,7 @@ public: friend bool operator==(const LLMatrix4 &a, const LLMatrix4 &b); // Return a == b friend bool operator!=(const LLMatrix4 &a, const LLMatrix4 &b); // Return a != b + friend bool operator<(const LLMatrix4 &a, const LLMatrix4& b); // Return a < b friend const LLMatrix4& operator+=(LLMatrix4 &a, const LLMatrix4 &b); // Return a + b friend const LLMatrix4& operator-=(LLMatrix4 &a, const LLMatrix4 &b); // Return a - b |