diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-09-07 13:58:19 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-07 13:58:19 -0700 |
| commit | 78821c51a1f7d5fcc6e4a2678bfd3446ccfaee36 (patch) | |
| tree | 51da53114f257ca57c2aa36da655019b75cf0269 /indra/newview/llsechandler_basic.cpp | |
| parent | c64bd7d5cb28fc221716e866ff9c9a28c22e69ce (diff) | |
| parent | fef401a1768bae9bfb23a13549fa3a5005f2c7ae (diff) | |
Merge from viewer-experience
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) { |