diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2022-05-26 11:18:44 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2022-05-26 11:18:44 -0600 |
| commit | 02c71b0ac2f99dd1c26a649ffce2182b2fc9a7d9 (patch) | |
| tree | 4255c2827cc3e07921275bfd7937f4f43f29d5fa /indra/llmath/v3math.h | |
| parent | 3f58ec2fdfb76ce2160884a3e97be49f60b6ac90 (diff) | |
| parent | cdbd06e8ed6e3f4285a61f5c0b607a65dfdf8dfd (diff) | |
Merge branch 'master' v 6.6.1 into DRTVWR-528
Diffstat (limited to 'indra/llmath/v3math.h')
| -rw-r--r-- | indra/llmath/v3math.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llmath/v3math.h b/indra/llmath/v3math.h index 6f857d7061..068f489020 100644 --- a/indra/llmath/v3math.h +++ b/indra/llmath/v3math.h @@ -33,6 +33,7 @@ #include "llsd.h" class LLVector2; class LLVector4; +class LLVector4a; class LLMatrix3; class LLMatrix4; class LLVector3d; @@ -62,7 +63,9 @@ class LLVector3 explicit LLVector3(const LLVector2 &vec); // Initializes LLVector3 to (vec[0]. vec[1], 0) explicit LLVector3(const LLVector3d &vec); // Initializes LLVector3 to (vec[0]. vec[1], vec[2]) explicit LLVector3(const LLVector4 &vec); // Initializes LLVector4 to (vec[0]. vec[1], vec[2]) - explicit LLVector3(const LLSD& sd); + explicit LLVector3(const LLVector4a& vec); // Initializes LLVector4 to (vec[0]. vec[1], vec[2]) + explicit LLVector3(const LLSD& sd); + LLSD getValue() const; |