From e7f1f4551092cdc4d23ff89d37e77a42096cd48e Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Wed, 13 Feb 2008 18:07:18 +0000 Subject: svn merge -r 79455:79892 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Server --> release * DEV-10498 The agentN-ds host name was constructed incorrectly and caused services_base_url to be incorrect * Fixed a potential crash bug caused by LSL library functions returning null pointers instead of empty strings. --- indra/lscript/lscript_byteconvert.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/lscript/lscript_byteconvert.h') diff --git a/indra/lscript/lscript_byteconvert.h b/indra/lscript/lscript_byteconvert.h index 6d0e2d08f3..923b2b402d 100644 --- a/indra/lscript/lscript_byteconvert.h +++ b/indra/lscript/lscript_byteconvert.h @@ -168,7 +168,7 @@ inline void bytestream2char(char *buffer, const U8 *stream, S32 &offset) ; } -inline void char2bytestream(U8 *stream, S32 &offset, char *buffer) +inline void char2bytestream(U8 *stream, S32 &offset, const char *buffer) { while ((*(stream + offset++) = *buffer++)) ; -- cgit v1.2.3