diff options
| author | simon <none@none> | 2013-05-09 14:10:45 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-05-09 14:10:45 -0700 |
| commit | ee2fce8790b69d61845cc32fbf7cdce8a33b0dab (patch) | |
| tree | 5060f42dca293102c868038f127c1a74f5c4a6aa /indra/lscript/lscript_byteformat.h | |
| parent | cd8e0b92e1c8f9f8544b1011e61c21c7789b93b7 (diff) | |
| parent | 8895e795763d14c3dae495b3648da3d4a52ba30a (diff) | |
Merge downstream code and viewer-beta
Diffstat (limited to 'indra/lscript/lscript_byteformat.h')
| -rwxr-xr-x[-rw-r--r--] | indra/lscript/lscript_byteformat.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/lscript/lscript_byteformat.h b/indra/lscript/lscript_byteformat.h index 9650574622..54031aaf05 100644..100755 --- a/indra/lscript/lscript_byteformat.h +++ b/indra/lscript/lscript_byteformat.h @@ -530,9 +530,10 @@ typedef enum e_lscript_runtime_permissions SCRIPT_PERMISSION_TRACK_CAMERA, SCRIPT_PERMISSION_CONTROL_CAMERA, SCRIPT_PERMISSION_TELEPORT, - SCRIPT_PERMISSION_EXPERIENCE, + SCRIPT_PERMISSION_EXPERIENCE, SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT, SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS, + SCRIPT_PERMISSION_RETURN_OBJECTS, SCRIPT_PERMISSION_EOF } LSCRIPTRunTimePermissions; @@ -550,9 +551,10 @@ const U32 LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_EOF] = (0x1 << 10),// SCRIPT_PERMISSION_TRACK_CAMERA (0x1 << 11),// SCRIPT_PERMISSION_CONTROL_CAMERA (0x1 << 12),// SCRIPT_PERMISSION_TELEPORT - (0x1 << 13),// SCRIPT_PERMISSION_EXPERIENCE - (0x1 << 14),// SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT - (0x1 << 15),// SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS + (0x1 << 13),// SCRIPT_PERMISSION_EXPERIENCE, + (0x1 << 14),// SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT, + (0x1 << 15),// SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS, + (0x1 << 16),// SCRIPT_PERMISSION_RETURN_OBJECTS, }; // http_request string constants |