diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-07-24 15:39:56 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-07-24 15:39:56 -0700 |
| commit | b47dbc2acadb1fa478daf89dbc3d54225c6e4629 (patch) | |
| tree | 9bc0cbf4795e1ebdfcb80848fea8ffe092b4983d /indra/lscript/lscript_byteformat.h | |
| parent | 9c394b3aaecacc9a70354c544bd728a4f4f966d2 (diff) | |
| parent | 90e25f6ba80b773117582d6a392037ac274fff39 (diff) | |
Merge with an oldish change of mine
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 |