From aa2b978bf59dd74083bec86c61a29fefb4ebb14c Mon Sep 17 00:00:00 2001 From: Kelly Washington Date: Tue, 24 Feb 2009 19:29:36 +0000 Subject: merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunk --- indra/lscript/lscript_byteformat.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'indra/lscript/lscript_byteformat.h') diff --git a/indra/lscript/lscript_byteformat.h b/indra/lscript/lscript_byteformat.h index 7333d47f15..ba2c46bef2 100644 --- a/indra/lscript/lscript_byteformat.h +++ b/indra/lscript/lscript_byteformat.h @@ -360,6 +360,7 @@ typedef enum e_lscript_state_event_type LSTT_OBJECT_REZ, LSTT_REMOTE_DATA, LSTT_HTTP_RESPONSE, + LSTT_HTTP_REQUEST, LSTT_EOF, LSTT_STATE_BEGIN = LSTT_STATE_ENTRY, @@ -401,7 +402,8 @@ const U64 LSCRIPTStateBitField[LSTT_EOF] = 0x0000000020000000, // LSTT_MOVING_END 0x0000000040000000, // LSTT_OBJECT_REZ 0x0000000080000000, // LSTT_REMOTE_DATA - 0x0000000100000000LL // LSTT_HTTP_RESPOSE + 0x0000000100000000LL, // LSTT_HTTP_RESPOSE + 0x0000000200000000LL // LSTT_HTTP_REQUEST }; inline S32 get_event_handler_jump_position(U64 bit_field, LSCRIPTStateEventType type) @@ -551,5 +553,10 @@ const U32 LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_EOF] = (0x1 << 11),// SCRIPT_PERMISSION_CONTROL_CAMERA }; +// http_request string constants +extern const char* URL_REQUEST_GRANTED; +extern const char* URL_REQUEST_DENIED; +extern const U64 LSL_HTTP_REQUEST_TIMEOUT; + #endif -- cgit v1.2.3