summaryrefslogtreecommitdiff
path: root/indra/lscript/lscript_byteformat.h
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-10-23 12:17:30 -0700
committerSteve Bennetts <steve@lindenlab.com>2009-10-23 12:17:30 -0700
commit80b682d4b4dd1256ee09dd3327d2c51e3adee0b5 (patch)
tree751731e4b23e08264caf6436ae2c60cff8094240 /indra/lscript/lscript_byteformat.h
parentb43771cad585cb9820941eb1b24b67390eaa9435 (diff)
parent127b428863707c882fbf4d30699321b8a2365644 (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