diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-02-24 13:42:44 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-02-24 13:42:44 -0800 |
| commit | 3fbaff17bf65a826dd8b9bd50dc460aacaa3cb00 (patch) | |
| tree | 05916e8997e5133af6d16ce9754a29b2aa0fc760 /indra/llcorehttp/httpoptions.cpp | |
| parent | 160bb09e775bc3c165cafefa4d80d861d4c39f2c (diff) | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
Pull merge from viewer-release
Diffstat (limited to 'indra/llcorehttp/httpoptions.cpp')
| -rwxr-xr-x | indra/llcorehttp/httpoptions.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/indra/llcorehttp/httpoptions.cpp b/indra/llcorehttp/httpoptions.cpp index 1699d19f8d..5bf1ecb4a5 100755 --- a/indra/llcorehttp/httpoptions.cpp +++ b/indra/llcorehttp/httpoptions.cpp @@ -4,7 +4,7 @@ * * $LicenseInfo:firstyear=2012&license=viewerlgpl$ * Second Life Viewer Source Code - * Copyright (C) 2012, Linden Research, Inc. + * Copyright (C) 2012-2013, Linden Research, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,7 +38,9 @@ HttpOptions::HttpOptions() mWantHeaders(false), mTracing(HTTP_TRACE_OFF), mTimeout(HTTP_REQUEST_TIMEOUT_DEFAULT), - mRetries(HTTP_RETRY_COUNT_DEFAULT) + mTransferTimeout(HTTP_REQUEST_XFER_TIMEOUT_DEFAULT), + mRetries(HTTP_RETRY_COUNT_DEFAULT), + mUseRetryAfter(HTTP_USE_RETRY_AFTER_DEFAULT) {} @@ -64,10 +66,21 @@ void HttpOptions::setTimeout(unsigned int timeout) } +void HttpOptions::setTransferTimeout(unsigned int timeout) +{ + mTransferTimeout = timeout; +} + + void HttpOptions::setRetries(unsigned int retries) { mRetries = retries; } +void HttpOptions::setUseRetryAfter(bool use_retry) +{ + mUseRetryAfter = use_retry; +} + } // end namespace LLCore |