diff options
| author | Christian Goetze <cg@lindenlab.com> | 2009-07-01 00:22:05 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2009-07-01 00:22:05 +0000 |
| commit | e588d1f28419745ee1e1ee98dc1852e0364a4088 (patch) | |
| tree | 8a3546576e0d5a8f0cf32cca68d0913f1061d523 /indra/lscript/lscript_byteformat.h | |
| parent | 5f4c09fa1f4b09126e1a16e78044c64e97828530 (diff) | |
svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654
QAR-1654 merge completed.
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 |