v2 lscript merge

This commit is contained in:
Shyotl
2011-06-16 23:56:56 -05:00
parent cfcc0a946d
commit 102ceaadfe
9 changed files with 74 additions and 106 deletions

View File

@@ -556,7 +556,7 @@ const U32 LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_EOF] =
// http_request string constants
extern const char* URL_REQUEST_GRANTED;
extern const char* URL_REQUEST_DENIED;
extern const U64 LSL_HTTP_REQUEST_TIMEOUT;
extern const U64 LSL_HTTP_REQUEST_TIMEOUT_USEC;
#endif