diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-02-13 18:07:18 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-02-13 18:07:18 +0000 |
| commit | e7f1f4551092cdc4d23ff89d37e77a42096cd48e (patch) | |
| tree | 60bebdd60fc4b05b2dc82a4edd88f4663ed10539 /indra/lscript/lscript_byteconvert.h | |
| parent | 54e428d2094267d993fd51dc1d879106083d3db5 (diff) | |
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.
Diffstat (limited to 'indra/lscript/lscript_byteconvert.h')
| -rw-r--r-- | indra/lscript/lscript_byteconvert.h | 2 |
1 files changed, 1 insertions, 1 deletions
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++)) ; |