summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-01-06 11:03:49 -0500
committerOz Linden <oz@lindenlab.com>2015-01-06 11:03:49 -0500
commit4f49b3c3dd7814658656a948303609cdf6c3498f (patch)
tree4af51ba796914b0838f1b5ca426270886dbe9c4c /indra/llmath
parentc0adf49fff9dc07f7d89c50d66f288bb66aa45b3 (diff)
parent8078ffffc2ac11e19dc8b72ddf53c279bfebf96a (diff)
merge changes for STORM-2083
Diffstat (limited to 'indra/llmath')
-rwxr-xr-xindra/llmath/llcalcparser.h6
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); }