diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-27 02:53:34 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-27 02:53:34 +0300 |
| commit | b2ef95522f07301cfddbdace1042e60d52fde436 (patch) | |
| tree | c51119f79b734a7d503bb3adeac1759b819c8f92 /indra/llmath/m4math.h | |
| parent | 43a338c6270f9a000052465d09d4ad999524af0b (diff) | |
| parent | 3da7a50b71d4ef5919c2d4d5b9547b3ef0abab7d (diff) | |
Merge branch 'DRTVWR-543-maint' into DRTVWR-543-maint_cmake
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 bf60adb9b6..b9da970cde 100644 --- a/indra/llmath/m4math.h +++ b/indra/llmath/m4math.h @@ -32,6 +32,7 @@ class LLVector4; class LLMatrix3; class LLQuaternion; +class LLMatrix4a; // NOTA BENE: Currently assuming a right-handed, x-forward, y-left, z-up universe @@ -104,6 +105,7 @@ public: explicit LLMatrix4(const F32 *mat); // Initializes Matrix to values in mat explicit LLMatrix4(const LLMatrix3 &mat); // Initializes Matrix to values in mat and sets position to (0,0,0) explicit LLMatrix4(const LLQuaternion &q); // Initializes Matrix with rotation q and sets position to (0,0,0) + explicit LLMatrix4(const LLMatrix4a& mat); LLMatrix4(const LLMatrix3 &mat, const LLVector4 &pos); // Initializes Matrix to values in mat and pos |