diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-19 12:57:25 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-19 12:57:25 -0700 |
| commit | 9fc74de1a18bbb209ee2524b0c833b3016ffc5e3 (patch) | |
| tree | 134b4ef690e12793dbfe60167625b65dcec6e996 /indra/lscript/lscript_byteformat.h | |
| parent | 0d6f1d125eb0f6de766d617978a022fc74b4aec7 (diff) | |
| parent | 909e784deb73d1da73928448cddb219af42ada93 (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 |