diff options
author | Oz Linden <oz@lindenlab.com> | 2014-05-07 11:09:04 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-05-07 11:09:04 -0400 |
commit | a98b4b6bee1b062722ce5eb03948a0fd33b74265 (patch) | |
tree | 88c030cef0c480f19ab9ff0a187b5c866da3a24a /indra/llmath/llcalc.cpp | |
parent | 9353868d91dfe2c4539c81c0b96bfe9efb497b2c (diff) | |
parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) |
merge changes for 3.7.7-release
Diffstat (limited to 'indra/llmath/llcalc.cpp')
-rwxr-xr-x | indra/llmath/llcalc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmath/llcalc.cpp b/indra/llmath/llcalc.cpp index 1b2d609b67..edc6986cc9 100755 --- a/indra/llmath/llcalc.cpp +++ b/indra/llmath/llcalc.cpp @@ -141,20 +141,20 @@ bool LLCalc::evalString(const std::string& expression, F32& result) try { info = parse(start, expr_upper.end(), calc, space_p); - lldebugs << "Math expression: " << expression << " = " << result << llendl; + LL_DEBUGS() << "Math expression: " << expression << " = " << result << LL_ENDL; } catch(parser_error<std::string, std::string::iterator> &e) { mLastErrorPos = e.where - expr_upper.begin(); - llinfos << "Calc parser exception: " << e.descriptor << " at " << mLastErrorPos << " in expression: " << expression << llendl; + LL_INFOS() << "Calc parser exception: " << e.descriptor << " at " << mLastErrorPos << " in expression: " << expression << LL_ENDL; return false; } if (!info.full) { mLastErrorPos = info.stop - expr_upper.begin(); - llinfos << "Unhandled syntax error at " << mLastErrorPos << " in expression: " << expression << llendl; + LL_INFOS() << "Unhandled syntax error at " << mLastErrorPos << " in expression: " << expression << LL_ENDL; return false; } |