summaryrefslogtreecommitdiff
path: root/indra/lscript/lscript_byteformat.h
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-05-29 20:41:10 +0000
committerDon Kjer <don@lindenlab.com>2012-05-29 20:41:10 +0000
commit2d3790b2396534de096244bf7b7660ec5ec3a139 (patch)
tree1cbe6616b0f1ef728370b73ad453857caf2eb53e /indra/lscript/lscript_byteformat.h
parent2a62ca5b96d08ad2f24e8a60e161657a7222aba6 (diff)
parenta519e34f02b4b2663fe082ba9ad12f1b423669cb (diff)
Merge ssh://hg@bitbucket.org/lindenlab/viewer-release -> viewer-eventapi-fixes
Diffstat (limited to 'indra/lscript/lscript_byteformat.h')
-rw-r--r--indra/lscript/lscript_byteformat.h2
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