diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-20 12:59:16 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-20 12:59:16 -0700 |
commit | 85c4d40614b501d401159b9bb064a4f4c726265e (patch) | |
tree | ef610b296660a2969d4df60ef331a3b4b411b676 /indra/lscript/lscript_byteformat.h | |
parent | a68b34eadf99c5875f2d7692185706e490e850bd (diff) | |
parent | b0dccf883ad67e43b9fac5bc81f7b79bf9c07f8c (diff) |
merge
Diffstat (limited to 'indra/lscript/lscript_byteformat.h')
-rw-r--r-- | indra/lscript/lscript_byteformat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/lscript/lscript_byteformat.h b/indra/lscript/lscript_byteformat.h index ba2c46bef2..a54ebd5831 100644 --- a/indra/lscript/lscript_byteformat.h +++ b/indra/lscript/lscript_byteformat.h @@ -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 |