summaryrefslogtreecommitdiff
path: root/indra/newview/llappcorehttp.cpp
diff options
context:
space:
mode:
authorNicky <nicky.dasmijn@gmail.com>2022-02-28 22:04:05 +0100
committerNicky <nicky.dasmijn@gmail.com>2022-02-28 22:04:05 +0100
commit43031968a653899f62755b6d7b7e28b7fedc24d9 (patch)
treec610012c5d4e568d94dea4208a80fe1be53ff2bf /indra/newview/llappcorehttp.cpp
parent07d7dcc0be9b793b1bcef63f526b441a58a9b764 (diff)
parent6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff)
Merge remote-tracking branch 'll/master'
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
{