diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-03-13 13:21:48 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-03-13 13:21:48 -0700 |
| commit | 898c9f44218353b3bf71b78ffce02662b4927625 (patch) | |
| tree | 2793682ba7d69d34730a4aeced04100312a479a2 /indra/llmath | |
| parent | 868cd32e5e229e503f1b5b1d5ec543fd6f76cb7f (diff) | |
Mods to make merge with viewer-release have less whitespace-only change and fix diffs between EEP and VR.
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llquaternion.cpp | 1 | ||||
| -rw-r--r-- | indra/llmath/llquaternion.h | 1 | ||||
| -rw-r--r-- | indra/llmath/llvolume.cpp | 1 | ||||
| -rw-r--r-- | indra/llmath/tests/m3math_test.cpp | 2 |
4 files changed, 2 insertions, 3 deletions
diff --git a/indra/llmath/llquaternion.cpp b/indra/llmath/llquaternion.cpp index a8d9eba2a0..57a976b57a 100644 --- a/indra/llmath/llquaternion.cpp +++ b/indra/llmath/llquaternion.cpp @@ -103,6 +103,7 @@ LLQuaternion::LLQuaternion(const LLVector3 &x_axis, *this = mat.quaternion(); normalize(); } + LLQuaternion::LLQuaternion(const LLSD &sd) { setValue(sd); diff --git a/indra/llmath/llquaternion.h b/indra/llmath/llquaternion.h index e2cdad548b..51ce163b4e 100644 --- a/indra/llmath/llquaternion.h +++ b/indra/llmath/llquaternion.h @@ -191,7 +191,6 @@ inline void LLQuaternion::setValue(const LLSD& sd) mQ[3] = sd[3].asReal(); } - // checker inline BOOL LLQuaternion::isFinite() const { diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 0e1748b337..605032e0a8 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -2204,7 +2204,6 @@ BOOL LLVolume::generate() { rot_mat.rotate(*profile++, tmp); dst->setAdd(tmp,offset); - ++dst; } } diff --git a/indra/llmath/tests/m3math_test.cpp b/indra/llmath/tests/m3math_test.cpp index 2a0fe76aa7..1ca2b005d9 100644 --- a/indra/llmath/tests/m3math_test.cpp +++ b/indra/llmath/tests/m3math_test.cpp @@ -77,7 +77,7 @@ namespace tut template<> template<> void m3math_test_object_t::test<2>() { - LLMatrix3 llmat3_obj; + LLMatrix3 llmat3_obj(30, 1, 2, 3); llmat3_obj.setZero(); ensure("LLMatrix3::setZero failed", 0.f == llmat3_obj.setZero().mMatrix[0][0] && |