diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
| commit | ce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch) | |
| tree | 3388e6f8ff02292ec4521d278c841801462945b8 /indra/lscript/lscript_compile | |
| parent | b699ae454d8477d19342d320758cd993d1d28cec (diff) | |
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/lscript/lscript_compile')
| -rw-r--r-- | indra/lscript/lscript_compile/indra.y | 1 | ||||
| -rw-r--r-- | indra/lscript/lscript_compile/lscript_tree.cpp | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/indra/lscript/lscript_compile/indra.y b/indra/lscript/lscript_compile/indra.y index 49d0c38b30..56f40c974c 100644 --- a/indra/lscript/lscript_compile/indra.y +++ b/indra/lscript/lscript_compile/indra.y @@ -53,7 +53,6 @@ %token QUATERNION %token LIST -%token STATE_DEFAULT %token STATE %token EVENT %token JUMP diff --git a/indra/lscript/lscript_compile/lscript_tree.cpp b/indra/lscript/lscript_compile/lscript_tree.cpp index 4f54bdd7b7..af06bc1c8b 100644 --- a/indra/lscript/lscript_compile/lscript_tree.cpp +++ b/indra/lscript/lscript_compile/lscript_tree.cpp @@ -8937,8 +8937,12 @@ void LLScriptEventHandler::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi { entrycount = 0; mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, mScopeEntry, entrycount, NULL); - fprintf(fp, "Function Args: %s\n", mScopeEntry->mFunctionArgs.mString); - fprintf(fp, "Local List: %s\n", mScopeEntry->mLocals.mString); + + const char *function_args = mScopeEntry->mFunctionArgs.mString; + fprintf(fp, "Function Args: %s\n", function_args?function_args:""); + + const char *local_list = mScopeEntry->mLocals.mString; + fprintf(fp, "Local List: %s\n", local_list?local_list:""); } mStackSpace = (S32)count; break; |