diff options
| author | prep linden <prep@lindenlab.com> | 2011-08-30 09:33:05 -0400 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-08-30 09:33:05 -0400 |
| commit | 6f2820bcd7b7ed06fefeca0e2c34c45ef77e4b62 (patch) | |
| tree | 1ba73003f2b299d6ab1a2b968c5d15688be23692 /indra/newview/llsechandler_basic.cpp | |
| parent | 71ac45a28b238bac4ac0cf43ee85f04589ffa116 (diff) | |
| parent | 8cef480b96dc779c5879f74224fb0a185ee550f2 (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) { |