diff options
author | Richard Linden <none@none> | 2014-04-07 19:09:40 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2014-04-07 19:09:40 -0700 |
commit | 98aabdc176c23de9ba23f902dc2015f9c775d26e (patch) | |
tree | 5ac6ffdb8e9be8d3c2a2f8b591c9971726c6b73c /indra/lscript/lscript_library/lscript_alloc.cpp | |
parent | 7e966f28da79d2d24f93a2615c8807421300700c (diff) | |
parent | e5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (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*/ |