summaryrefslogtreecommitdiff
path: root/indra/newview/llappcorehttp.cpp
diff options
context:
space:
mode:
authorBrad Kittenbrink <brad@lindenlab.com>2022-03-07 00:19:11 -0800
committerBrad Kittenbrink <brad@lindenlab.com>2022-03-07 00:19:11 -0800
commit89ab1e4525445d5efc370c381f7c1e18faab8f16 (patch)
tree3e1326470eddea3310bfd15867c9d54dd3b1652c /indra/newview/llappcorehttp.cpp
parent40b80251e48d5f0ae3695d9019261f9e472f3e16 (diff)
parent6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff)
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
Diffstat (limited to 'indra/newview/llappcorehttp.cpp')
-rw-r--r--indra/newview/llappcorehttp.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llappcorehttp.cpp b/indra/newview/llappcorehttp.cpp
index ef56478106..debf93dccd 100644
--- a/indra/newview/llappcorehttp.cpp
+++ b/indra/newview/llappcorehttp.cpp
@@ -524,6 +524,11 @@ void LLAppCoreHttp::refreshSettings(bool initial)
LLCore::HttpStatus LLAppCoreHttp::sslVerify(const std::string &url,
const LLCore::HttpHandler::ptr_t &handler, void *appdata)
{
+ if (gDisconnected)
+ {
+ return LLCore::HttpStatus(LLCore::HttpStatus::EXT_CURL_EASY, CURLE_OPERATION_TIMEDOUT);
+ }
+
LLCore::HttpStatus result;
try
{