diff options
author | Oz Linden <oz@lindenlab.com> | 2012-05-26 16:12:33 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-05-26 16:12:33 -0400 |
commit | dbac37dcb50bf44255c2b622d418bb4339f1afca (patch) | |
tree | acffbcb5984696e507243f939f6b9c5a951b755b /indra/lscript/lscript_compile/indra.l | |
parent | 790dfda43472da75d17a848eb91e2dcecb2b96e7 (diff) | |
parent | b2b446aed7f7f32151bc152ba25d44253ebf864f (diff) |
merge latest viewer-release
Diffstat (limited to 'indra/lscript/lscript_compile/indra.l')
-rw-r--r-- | indra/lscript/lscript_compile/indra.l | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l index 4e103ae2ba..96b7e57e97 100644 --- a/indra/lscript/lscript_compile/indra.l +++ b/indra/lscript/lscript_compile/indra.l @@ -212,7 +212,8 @@ extern "C" { int yyerror(const char *fmt, ...); } "PERMISSION_CHANGE_JOINTS" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_CHANGE_JOINTS]; return(INTEGER_CONSTANT); } "PERMISSION_CHANGE_PERMISSIONS" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_CHANGE_PERMISSIONS]; return(INTEGER_CONSTANT); } "PERMISSION_TRACK_CAMERA" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_TRACK_CAMERA]; return(INTEGER_CONSTANT); } -"PERMISSION_CONTROL_CAMERA" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_CONTROL_CAMERA]; return(INTEGER_CONSTANT); } +"PERMISSION_CONTROL_CAMERA" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_CONTROL_CAMERA]; return(INTEGER_CONSTANT); } +"PERMISSION_TELEPORT" { count(); yylval.ival = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_TELEPORT]; return(INTEGER_CONSTANT); } "INVENTORY_TEXTURE" { count(); yylval.ival = LLAssetType::AT_TEXTURE; return(INTEGER_CONSTANT); } "INVENTORY_SOUND" { count(); yylval.ival = LLAssetType::AT_SOUND; return(INTEGER_CONSTANT); } |