diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-04-11 17:54:18 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-04-11 17:54:18 +0000 |
| commit | 0277259455c4354f81ea8a24c8ab93f27567bc6f (patch) | |
| tree | f1411dab563dcf697f794e9e8a592a6d3e5c4d2d /indra/lscript | |
| parent | 568397bbcc4fca307ebc010ec7f815422b9ba80a (diff) | |
svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/lscript')
| -rw-r--r-- | indra/lscript/lscript_compile/lscript_tree.cpp | 1 | ||||
| -rw-r--r-- | indra/lscript/lscript_execute/lscript_execute.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/indra/lscript/lscript_compile/lscript_tree.cpp b/indra/lscript/lscript_compile/lscript_tree.cpp index 8b6ec2ad0c..ae2a0c8afe 100644 --- a/indra/lscript/lscript_compile/lscript_tree.cpp +++ b/indra/lscript/lscript_compile/lscript_tree.cpp @@ -251,7 +251,6 @@ void LLScriptConstantString::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom break; case LSCP_EMIT_ASSEMBLY: fprintf(fp, "PUSHARGS \"%s\"\n", mValue); - fprintf(fp, "STACKTOS %lu\n", strlen(mValue) + 1); /*Flawfinder: ignore*/ break; case LSCP_TYPE: type = mType; diff --git a/indra/lscript/lscript_execute/lscript_execute.cpp b/indra/lscript/lscript_execute/lscript_execute.cpp index 4521c7b43c..9f123025ff 100644 --- a/indra/lscript/lscript_execute/lscript_execute.cpp +++ b/indra/lscript/lscript_execute/lscript_execute.cpp @@ -3337,6 +3337,7 @@ BOOL run_cast(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id) BOOL run_stacktos(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id) { + offset++; S32 length = lscript_pop_int(buffer); S32 i; char *arg = new char[length]; |