diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-07 12:41:11 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-07 12:41:11 -0500 |
| commit | 5822fb00b605d4f4ddd01e887b40d04b67e162a9 (patch) | |
| tree | 0aa733a2357c99383f18ed34d2fb2ad4ad0caa24 /indra/llmath | |
| parent | c7ebeb842010c4a814978f63c464e1546bd6a9be (diff) | |
| parent | 346ee6595d395a92a1445441467971510e6f4b6d (diff) | |
merge DRTVWR-398 build cleanup fixes
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llcalcparser.h | 6 | ||||
| -rw-r--r-- | indra/llmath/llvolume.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/llmath/llcalcparser.h b/indra/llmath/llcalcparser.h index faa699ff7b..e2388d6702 100644 --- a/indra/llmath/llcalcparser.h +++ b/indra/llmath/llcalcparser.h @@ -167,9 +167,9 @@ private: F32 _sin(const F32& a) const { return sin(DEG_TO_RAD * a); } F32 _cos(const F32& a) const { return cos(DEG_TO_RAD * a); } F32 _tan(const F32& a) const { return tan(DEG_TO_RAD * a); } - F32 _asin(const F32& a) const { return asin(a * RAD_TO_DEG); } - F32 _acos(const F32& a) const { return acos(a * RAD_TO_DEG); } - F32 _atan(const F32& a) const { return atan(a * RAD_TO_DEG); } + F32 _asin(const F32& a) const { return asin(a) * RAD_TO_DEG; } + F32 _acos(const F32& a) const { return acos(a) * RAD_TO_DEG; } + F32 _atan(const F32& a) const { return atan(a) * RAD_TO_DEG; } F32 _sqrt(const F32& a) const { return sqrt(a); } F32 _log(const F32& a) const { return log(a); } F32 _exp(const F32& a) const { return exp(a); } diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 8608e45a91..d932eb53a0 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -2202,7 +2202,7 @@ BOOL LLVolume::generate() { rot_mat.rotate(*profile++, tmp); dst->setAdd(tmp,offset); - llassert(dst->isFinite3()); + llassert(dst->isFinite3()); // MAINT-5660; don't know why this happens, does not affect Release builds ++dst; } } @@ -5663,7 +5663,7 @@ BOOL LLVolumeFace::createCap(LLVolume* volume, BOOL partial_build) tc->mV[0] = (*p)[0]+0.5f; tc->mV[1] = (*p)[1]+0.5f; - llassert(src->isFinite3()); + llassert(src->isFinite3()); // MAINT-5660; don't know why this happens, does not affect Release builds update_min_max(min,max,*src); update_min_max(min_uv, max_uv, *tc); |