diff options
Diffstat (limited to 'indra/lscript/lscript_byteformat.h')
| -rw-r--r-- | indra/lscript/lscript_byteformat.h | 63 |
1 files changed, 26 insertions, 37 deletions
diff --git a/indra/lscript/lscript_byteformat.h b/indra/lscript/lscript_byteformat.h index 4e8f13f68a..7dd21bb1ad 100644 --- a/indra/lscript/lscript_byteformat.h +++ b/indra/lscript/lscript_byteformat.h @@ -2,30 +2,25 @@ * @file lscript_byteformat.h * @brief Shared code between compiler and assembler and LSL * - * $LicenseInfo:firstyear=2002&license=viewergpl$ - * - * Copyright (c) 2002-2007, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2002&license=viewerlgpl$ * Second Life Viewer Source Code - * The source code in this file ("Source Code") is provided by Linden Lab - * to you under the terms of the GNU General Public License, version 2.0 - * ("GPL"), unless you have obtained a separate licensing agreement - * ("Other License"), formally executed by you and Linden Lab. Terms of - * the GPL can be found in doc/GPL-license.txt in this distribution, or - * online at http://secondlife.com/developers/opensource/gplv2 + * Copyright (C) 2010, Linden Research, Inc. * - * There are special exceptions to the terms and conditions of the GPL as - * it is applied to this Source Code. View the full text of the exception - * in the file doc/FLOSS-exception.txt in this software distribution, or - * online at http://secondlife.com/developers/opensource/flossexception + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. * - * By copying, modifying or distributing this software, you acknowledge - * that you have read and understood your obligations described above, - * and agree to abide by those obligations. + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -359,6 +354,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, @@ -400,7 +396,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) @@ -470,6 +467,7 @@ const U8 LSCRIPTTypeHi4Bits[LST_EOF] = LST_VECTOR << 4, LST_QUATERNION << 4, LST_LIST << 4, + LST_UNDEFINED << 4, }; const char * const LSCRIPTTypeNames[LST_EOF] = /*Flawfinder: ignore*/ @@ -512,25 +510,11 @@ typedef enum e_lscript_runtime_faults LSRF_CHAT_OVERRUN, LSRF_TOO_MANY_LISTENS, LSRF_NESTING_LISTS, + LSRF_CLI, LSRF_EOF } LSCRIPTRunTimeFaults; -extern char* LSCRIPTRunTimeFaultStrings[LSRF_EOF]; /*Flawfinder: ignore*/ - -const S32 LSCRIPTRunTimeFaultBits[LSRF_EOF] = -{ - 0, // LSRF_INVALID - 1, // LSRF_MATH - 2, // LSRF_STACK_HEAP_COLLISION - 3, // LSREF_BOUND_CHECK_ERROR - 4, // LSREF_HEAP_ERROR - 5, // LSREF_VERSION_MISMATCH - 6, // LSREF_MISSING_INVENTORY - 7, // LSRF_SANDBOX - 8, // LSRF_CHAT_OVERRUN - 9, // LSRF_TOO_MANY_LISTENS - 10, // LSRF_NESTING_LISTS -}; +extern const char* LSCRIPTRunTimeFaultStrings[LSRF_EOF]; /*Flawfinder: ignore*/ typedef enum e_lscript_runtime_permissions { @@ -563,5 +547,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_USEC; + #endif |