diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-05-07 11:14:26 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-05-07 11:14:26 -0700 |
| commit | 48fece44737fa8b9614fd864354d9287a216ea33 (patch) | |
| tree | f68426d79f4631c6b49be142a92e59086870fa38 /indra/llmath/llcalcparser.h | |
| parent | ae856ef31830912cec0f4de37167858a24e4ba30 (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Merge with 3.7.7-release
Diffstat (limited to 'indra/llmath/llcalcparser.h')
| -rwxr-xr-x | indra/llmath/llcalcparser.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/llmath/llcalcparser.h b/indra/llmath/llcalcparser.h index e0ad270266..faa699ff7b 100755 --- a/indra/llmath/llcalcparser.h +++ b/indra/llmath/llcalcparser.h @@ -163,7 +163,7 @@ private: bool checkNaN(const F32& a) const { return !llisnan(a); } - //FIX* non ambigious function fix making SIN() work for calc -Cryogenic Blitz + //FIX* non ambiguous function fix making SIN() work for calc -Cryogenic Blitz 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); } @@ -176,11 +176,8 @@ private: F32 _fabs(const F32& a) const { return fabs(a); } F32 _floor(const F32& a) const { return (F32)llfloor(a); } F32 _ceil(const F32& a) const { return llceil(a); } - F32 _atan2(const F32& a,const F32& b) const { return atan2(a,b); } - - LLCalc::calc_map_t* mConstants; LLCalc::calc_map_t* mVariables; // LLCalc::calc_map_t* mUserVariables; |