Merge downstream version 3.7.8 code

2 files changed, 2 insertions, 2 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*/
diff --git a/indra/lscript/lscript_library/lscript_library.cpp b/indra/lscript/lscript_library/lscript_library.cpp
index 7ffe53a307..84ce94eead 100755
--- a/indra/lscript/lscript_library/lscript_library.cpp
+++ b/indra/lscript/lscript_library/lscript_library.cpp
@@ -498,7 +498,7 @@ void LLScriptLibrary::assignExec(const char *name, void (*exec_func)(LLScriptLib
 		}
 	}
 	
-	llerrs << "Unknown LSL function in assignExec: " << name << llendl;
+	LL_ERRS() << "Unknown LSL function in assignExec: " << name << LL_ENDL;
 }
 
 void LLScriptLibData::print(std::ostream &s, BOOL b_prepend_comma)