diff options
author | Nicky <nicky.dasmijn@gmail.com> | 2022-06-13 20:09:42 +0200 |
---|---|---|
committer | Nicky <nicky.dasmijn@gmail.com> | 2022-06-13 20:09:42 +0200 |
commit | 1b73835d6e80bc64c520a8846aebdbe1b7c9705b (patch) | |
tree | b972275919bf6c620bbbcb81dd6b12568494561e /indra/llmath/v3math.h | |
parent | 78e069f5e8ef1ee312e709934482b23aa86a69c2 (diff) | |
parent | c08a61453b21664da3687661512e2ea208f90d98 (diff) |
Merge branch 'DRTVWR-543-maint_cmake' of bitbucket.org:NickyD/viewer-cmake into DRTVWR-543-maint_cmake
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; |