diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-11-02 14:09:43 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-11-02 14:09:43 -0500 |
| commit | 11c428759e0b99fc34e219181d81d024b0323b4d (patch) | |
| tree | e6ee27fa90d7767ac8f959c97474ee34bab00211 /indra/lscript/lscript_compile/indra.l | |
| parent | 84150294b912d04e345007b65670c0230a2e4d79 (diff) | |
| parent | 77da469d6f7901ee0cddf5fb351cd2a756b217f0 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/lscript/lscript_compile/indra.l')
| -rwxr-xr-x | indra/lscript/lscript_compile/indra.l | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l index c2e21335e9..025cbfc3a3 100755 --- a/indra/lscript/lscript_compile/indra.l +++ b/indra/lscript/lscript_compile/indra.l @@ -102,7 +102,7 @@ int yyerror(const char *fmt, ...); "event" { count(); return(EVENT); } "jump" { count(); return(JUMP); } "return" { count(); return(RETURN); } -"if" { count(); return(IF); } +"if" { count(); return(IFF); } "else" { count(); return(ELSE); } "for" { count(); return(FOR); } "do" { count(); return(DO); } |