summaryrefslogtreecommitdiff
path: root/indra/llcrashlogger
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2021-07-19 15:31:44 -0600
committerDave Houlton <euclid@lindenlab.com>2021-07-19 15:31:44 -0600
commitaa322d8eb4341c213a19cef87a887114c1ca278b (patch)
tree5ec6c6d42eaca354f58e21b926d9108e43367484 /indra/llcrashlogger
parent10f84d8244d01728338f1eb20b0b25271fc7db63 (diff)
parentbe6066eae218856f7fd74b98968a75e5062fa830 (diff)
Merge branch 'master' v 6.4.22 into DRTVWR-541
Diffstat (limited to 'indra/llcrashlogger')
-rw-r--r--indra/llcrashlogger/README.txt3
-rw-r--r--indra/llcrashlogger/llcrashlogger.cpp1
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcrashlogger/README.txt b/indra/llcrashlogger/README.txt
new file mode 100644
index 0000000000..6932a8d9c3
--- /dev/null
+++ b/indra/llcrashlogger/README.txt
@@ -0,0 +1,3 @@
+This component is no longer used in Linden Lab builds.
+Change requests to support continued use by open source
+builds are welcome.
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index 62fcdaf545..e02f3a6306 100644
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -411,6 +411,7 @@ bool LLCrashLogger::runCrashLogPost(std::string host, LLSD data, std::string msg
LLCore::HttpOptions::ptr_t httpOpts(new LLCore::HttpOptions);
httpOpts->setTimeout(timeout);
+ httpOpts->setSSLVerifyPeer(false);
for(int i = 0; i < retries; ++i)
{