diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-09-01 17:06:15 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-09-01 17:06:15 -0400 |
| commit | 9a1e8d78fe461e5257ca76c295c4915f8719aa4d (patch) | |
| tree | f7cd1dd498fc712c27b7159b21c062f35e3717f6 /indra/newview/llsechandler_basic.cpp | |
| parent | 342005cd92b6fafdb0fee1d59a3c8750ccb34f1c (diff) | |
| parent | e62a4d4ec151e81f4dc68b29a009596d3d154d57 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llsechandler_basic.cpp')
| -rw-r--r-- | indra/newview/llsechandler_basic.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp index 904bb03270..8d64c8c04f 100644 --- a/indra/newview/llsechandler_basic.cpp +++ b/indra/newview/llsechandler_basic.cpp @@ -1005,6 +1005,8 @@ void LLBasicCertificateStore::validate(int validation_policy, LLPointer<LLCertificateChain> cert_chain, const LLSD& validation_params) { + // If --no-verify-ssl-cert was passed on the command line, stop right now. + if (gSavedSettings.getBOOL("NoVerifySSLCert")) return; if(cert_chain->size() < 1) { |