diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-07-30 11:09:00 -0400 | 
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-07-30 11:09:00 -0400 | 
| commit | 71a468c6fb52f2f2cc7ebd17e548e9eaf3a875a5 (patch) | |
| tree | e2d49a6fe81f8fd9f0e8793112830d7b17d9068d /indra/llmath | |
| parent | f46526b16004e734d0a459e482ab9bb5df656c54 (diff) | |
| parent | 94744d4e5ec1bb8dfafa2c459ebc8fbf0b92a68a (diff) | |
merge changes for other open sourc contributions
Diffstat (limited to 'indra/llmath')
| -rwxr-xr-x | indra/llmath/llcalcparser.h | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/indra/llmath/llcalcparser.h b/indra/llmath/llcalcparser.h index faa699ff7b..e2388d6702 100755 --- 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); } | 
