diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-26 09:59:39 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-26 09:59:39 -0700 |
commit | d6e8f32b8073d85db59f2a45a10d622b71c859ae (patch) | |
tree | 953c5efd60338604c229824467270cd8d5a458ce /indra/lscript/lscript_byteformat.h | |
parent | add9298c1e4d74bdb5503722a6c795ea6f30fa11 (diff) | |
parent | 53c972a521cbb92c6c9390c41b250a41dc22cd5a (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 |