diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-09-13 18:17:52 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-09-13 18:17:52 +0000 |
| commit | b3d807d5ff8dca6c891e9a5e0ddc7bc147d69f8c (patch) | |
| tree | 8b94c90d06bcd0ed5d258ab1e8c5d67024683cab /indra/lscript/lscript_compile/indra.l | |
| parent | a5f3ac2a8dc9aee2c04f24c3b3304c1b24808acb (diff) | |
svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
Merge patches made in the 1-18-3 RC iterations into the trunk.
NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
Diffstat (limited to 'indra/lscript/lscript_compile/indra.l')
| -rw-r--r-- | 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 94cb196aea..a8fbcbe260 100644 --- a/indra/lscript/lscript_compile/indra.l +++ b/indra/lscript/lscript_compile/indra.l @@ -227,7 +227,7 @@ extern "C" { int yyerror(const char *fmt, ...); } "CHANGED_REGION" { count(); yylval.ival = 0x100; return(INTEGER_CONSTANT); } "CHANGED_TELEPORT" { count(); yylval.ival = 0x200; return(INTEGER_CONSTANT); } -"OBJECT_UNKOWN_DETAIL" { count(); yylval.ival = OBJECT_UNKOWN_DETAIL; return(INTEGER_CONSTANT); } +"OBJECT_UNKNOWN_DETAIL" { count(); yylval.ival = OBJECT_UNKNOWN_DETAIL; return(INTEGER_CONSTANT); } "OBJECT_NAME" { count(); yylval.ival = OBJECT_NAME; return(INTEGER_CONSTANT); } "OBJECT_DESC" { count(); yylval.ival = OBJECT_DESC; return(INTEGER_CONSTANT); } "OBJECT_POS" { count(); yylval.ival = OBJECT_POS; return(INTEGER_CONSTANT); } |