diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-21 18:49:19 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-21 18:49:19 -0700 |
commit | 642d368eccd662494a4958a50ba2bd3301b5207e (patch) | |
tree | 0aaa9d2981260051009e765a6171ad328f031183 /indra/lscript/lscript_byteformat.h | |
parent | c7786aa5b614d1c88359bacbe9bd447f5acdd84c (diff) | |
parent | e25395e10f5abbed1ed7bc3e4a7fc892070ddc50 (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 |