diff options
| author | callum_linden <none@none> | 2014-10-17 14:48:17 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-17 14:48:17 -0700 |
| commit | e4977efddb22cc76b8953a338e6575c7b1f3bbd8 (patch) | |
| tree | 23cb7037b3083e9d9ddd04d1a0884b1d6fe3de94 | |
| parent | 5f9b595fbef62ebe61c2e93cfc43066955d39f8a (diff) | |
Update to build on Xcode 6.0: removed unised const variables [-Wunused-const-variable]
| -rwxr-xr-x | indra/llmessage/llcachename.cpp | 3 | ||||
| -rwxr-xr-x | indra/llmessage/llhttpassetstorage.cpp | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp index 4dd8d04656..daf3e0b4de 100755 --- a/indra/llmessage/llcachename.cpp +++ b/indra/llmessage/llcachename.cpp @@ -51,9 +51,6 @@ static const std::string NAME("name"); // We won't re-request a name during this time const U32 PENDING_TIMEOUT_SECS = 5 * 60; -// File version number -const S32 CN_FILE_VERSION = 2; - // Globals LLCacheName* gCacheName = NULL; std::map<std::string, std::string> LLCacheName::sCacheName; 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; |