diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-05-25 18:44:47 -0700 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-05-25 18:44:47 -0700 |
commit | f83fcc357ff23418b0692bdaf3ae998f870685a0 (patch) | |
tree | 731cd8ac153fcd4ed3ef7e5e8d63cc2c60b46117 /indra/lscript/lscript_byteformat.h | |
parent | 05921cfcb2db7ccc8fb872d942eb236b839e3dad (diff) | |
parent | b2b446aed7f7f32151bc152ba25d44253ebf864f (diff) |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
Diffstat (limited to 'indra/lscript/lscript_byteformat.h')
-rw-r--r-- | indra/lscript/lscript_byteformat.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/lscript/lscript_byteformat.h b/indra/lscript/lscript_byteformat.h index 7dd21bb1ad..a294def734 100644 --- a/indra/lscript/lscript_byteformat.h +++ b/indra/lscript/lscript_byteformat.h @@ -529,6 +529,7 @@ typedef enum e_lscript_runtime_permissions SCRIPT_PERMISSION_CHANGE_PERMISSIONS, SCRIPT_PERMISSION_TRACK_CAMERA, SCRIPT_PERMISSION_CONTROL_CAMERA, + SCRIPT_PERMISSION_TELEPORT, SCRIPT_PERMISSION_EOF } LSCRIPTRunTimePermissions; @@ -545,6 +546,7 @@ const U32 LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_EOF] = (0x1 << 9), // SCRIPT_PERMISSION_CHANGE_PERMISSIONS (0x1 << 10),// SCRIPT_PERMISSION_TRACK_CAMERA (0x1 << 11),// SCRIPT_PERMISSION_CONTROL_CAMERA + (0x1 << 12),// SCRIPT_PERMISSION_TELEPORT }; // http_request string constants |