diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2021-10-07 16:07:37 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2021-10-07 16:07:37 -0400 |
commit | fb675e81854c68172642446398c0743bacc8bd41 (patch) | |
tree | 480ed27223a3785b411d9b28c0108ace1c70816e /indra/llmath/v3math.cpp | |
parent | 623ac79120a417ec445ce5c106a907fe46734309 (diff) | |
parent | 027ca696bd7bf222be63cf4d0af6e975b83a6815 (diff) |
SL-16024: Merge branch 'DRTVWR-546' into SL-16024-to-546
Diffstat (limited to 'indra/llmath/v3math.cpp')
-rw-r--r-- | indra/llmath/v3math.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llmath/v3math.cpp b/indra/llmath/v3math.cpp index b04c67d926..93010d2250 100644 --- a/indra/llmath/v3math.cpp +++ b/indra/llmath/v3math.cpp @@ -316,6 +316,12 @@ LLVector3::LLVector3(const LLVector4 &vec) mV[VZ] = (F32)vec.mV[VZ]; } +LLVector3::LLVector3(const LLVector4a& vec) + : LLVector3(vec.getF32ptr()) +{ + +} + LLVector3::LLVector3(const LLSD& sd) { setValue(sd); |