aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/lscript/lscript_byteconvert.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/lscript/lscript_byteconvert.h
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/lscript/lscript_byteconvert.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/lscript/lscript_byteconvert.h b/linden/indra/lscript/lscript_byteconvert.h
index e17f3fc..9530b63 100644
--- a/linden/indra/lscript/lscript_byteconvert.h
+++ b/linden/indra/lscript/lscript_byteconvert.h
@@ -415,7 +415,7 @@ inline void set_fault(const U8 *stream, LSCRIPTRunTimeFaults fault)
415 reset_hp_to_safe_spot(stream); 415 reset_hp_to_safe_spot(stream);
416// lsa_print_heap((U8 *)stream); 416// lsa_print_heap((U8 *)stream);
417 } 417 }
418 fr = LSCRIPTRunTimeFaultBits[fault]; 418 fr = fault;
419 set_register((U8 *)stream, LREG_FR, fr); 419 set_register((U8 *)stream, LREG_FR, fr);
420 } 420 }
421} 421}
@@ -1110,7 +1110,7 @@ inline void safe_heap_bytestream_count_char(U8 *stream, S32 &offset)
1110 ; 1110 ;
1111} 1111}
1112 1112
1113inline void safe_instruction_char2bytestream(U8 *stream, S32 &offset, char *buffer) 1113inline void safe_instruction_char2bytestream(U8 *stream, S32 &offset, const char* buffer)
1114{ 1114{
1115 while ( (safe_instruction_check_address(stream, offset, 1)) 1115 while ( (safe_instruction_check_address(stream, offset, 1))
1116 &&(*(stream + offset++) = *buffer++)) 1116 &&(*(stream + offset++) = *buffer++))