summaryrefslogtreecommitdiff
path: root/indra/lscript/lscript_byteformat.h
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-11-02 10:55:59 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-11-02 10:55:59 -0800
commitb877665551343dc94ca02c84622b06518f9c23d8 (patch)
tree9ad6a76d0363b56ccb249f105d6ee72207df8864 /indra/lscript/lscript_byteformat.h
parentf732ee6d2e24cd42a06b9cf51c8f6c577f2e476e (diff)
parent6e018f7143537af7bd9a08f1cc5c87ea4c8382c8 (diff)
merge
Diffstat (limited to 'indra/lscript/lscript_byteformat.h')
-rw-r--r--indra/lscript/lscript_byteformat.h2
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