diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-29 12:23:28 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-29 12:23:28 -0400 |
| commit | 5a39c44b56191a4ba516d3c504b3a0a574156e72 (patch) | |
| tree | e95e5fc6cde0a046ac88abeba4a3410123cae890 /indra/newview/llsechandler_basic.cpp | |
| parent | f5a890453b0a98636e6267b3272567ae0eecf1e4 (diff) | |
| parent | 68a15f73c190d2a803ad8b11ed8d9b32bc9e46ee (diff) | |
merged .hgtags
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) { |