diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-28 16:41:06 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-28 16:41:06 -0600 |
| commit | 746037362ed07af0c799caf22cf9e425744359a0 (patch) | |
| tree | 2e4c83fee5334da2071103fa4706ac4abb218490 /indra/llmath/m4math.h | |
| parent | 26a0c18e95d8d542016d89cc78b948438bc335cb (diff) | |
| parent | b414b5067e3e47da7d9baf490d94534b4c65a8eb (diff) | |
merge
Diffstat (limited to 'indra/llmath/m4math.h')
| -rw-r--r-- | indra/llmath/m4math.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/llmath/m4math.h b/indra/llmath/m4math.h index 6007b96bd9..40599a0886 100644 --- a/indra/llmath/m4math.h +++ b/indra/llmath/m4math.h @@ -226,10 +226,7 @@ public: // Operators // -// Not implemented to enforce code that agrees with symbolic syntax -// friend LLVector4 operator*(const LLMatrix4 &a, const LLVector4 &b); // Apply rotation a to vector b - -// friend inline LLMatrix4 operator*(const LLMatrix4 &a, const LLMatrix4 &b); // Return a * b + // friend inline LLMatrix4 operator*(const LLMatrix4 &a, const LLMatrix4 &b); // Return a * b friend LLVector4 operator*(const LLVector4 &a, const LLMatrix4 &b); // Return transform of vector a by matrix b friend const LLVector3 operator*(const LLVector3 &a, const LLMatrix4 &b); // Return full transform of a by matrix b friend LLVector4 rotate_vector(const LLVector4 &a, const LLMatrix4 &b); // Rotates a but does not translate |