diff options
| author | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-23 22:43:05 +0200 |
|---|---|---|
| committer | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-23 22:43:05 +0200 |
| commit | 942d72ec36aa0e8be1d1aac35ab679463741b2d1 (patch) | |
| tree | 02f84efaf0effaccc11e48c161a45f6693ec61c5 /indra/llmessage/llhttpassetstorage.cpp | |
| parent | 2eb07a7080a85e9a63a6f5aff49907b386b865d2 (diff) | |
| parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) | |
Merge
Diffstat (limited to 'indra/llmessage/llhttpassetstorage.cpp')
| -rwxr-xr-x | indra/llmessage/llhttpassetstorage.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llmessage/llhttpassetstorage.cpp b/indra/llmessage/llhttpassetstorage.cpp index a30140e8f3..e202154445 100755 --- a/indra/llmessage/llhttpassetstorage.cpp +++ b/indra/llmessage/llhttpassetstorage.cpp @@ -47,8 +47,7 @@ const char* const LOCAL_ASSET_URL_FORMAT = "http://%s:12041/asset"; const U32 MAX_RUNNING_REQUESTS = 1; -const F32 MAX_PROCESSING_TIME = 0.005f; -const S32 CURL_XFER_BUFFER_SIZE = 65536; + // Try for 30 minutes for now. const F32 GET_URL_TO_FILE_TIMEOUT = 1800.0f; |