diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-29 16:20:20 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-29 16:20:20 -0700 |
| commit | 9b8b0571645f8b607ecc24221c807cc02a03692f (patch) | |
| tree | f52f58138ecf70abf21f2a1b62097c3cbfce1c2f /indra/lscript/lscript_byteformat.h | |
| parent | 6d887be5895286f6b65ea751014f33bd9e0faac4 (diff) | |
| parent | 5798ac6fc8488f02d3a2f338f5b5eeedb35e7ba6 (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 |