diff options
author | Richard Linden <none@none> | 2014-02-24 18:45:59 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2014-02-24 18:45:59 -0800 |
commit | 80b4a4a1f54dccb814b5486423bf6492b3ae58a7 (patch) | |
tree | f17c7a9b433e443b2f30251dd15b1bf50d4f803c /indra/lscript/lscript_library/lscript_alloc.cpp | |
parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
parent | ef591d280eb3c5bae7da20540ad4cbb30858d0aa (diff) |
merge with release
Diffstat (limited to 'indra/lscript/lscript_library/lscript_alloc.cpp')
-rwxr-xr-x | indra/lscript/lscript_library/lscript_alloc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/lscript/lscript_library/lscript_alloc.cpp b/indra/lscript/lscript_library/lscript_alloc.cpp index 92b1ab70fb..62ba029e8a 100755 --- a/indra/lscript/lscript_library/lscript_alloc.cpp +++ b/indra/lscript/lscript_library/lscript_alloc.cpp @@ -435,7 +435,7 @@ S32 lsa_create_data_block(U8 **buffer, LLScriptLibData *data, S32 base_offset) U8 *tbuff = new U8[size + listsize]; if (tbuff == NULL) { - llerrs << "Memory Allocation Failed" << llendl; + LL_ERRS() << "Memory Allocation Failed" << LL_ENDL; } memcpy(tbuff, *buffer, size); /*Flawfinder: ignore*/ memcpy(tbuff + size, listbuf, listsize); /*Flawfinder: ignore*/ |