diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-29 10:36:48 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-29 10:36:48 -0400 |
| commit | f054d44f9e2e0d152b1a0167b007eb10105487d6 (patch) | |
| tree | 3cf567add6e532f212192a6c94bfaf17c7eecc76 /indra/newview/llsechandler_basic.cpp | |
| parent | 2e4dcca9e2049aa4a8c29820937b6a956d75e5d8 (diff) | |
| parent | d45995b80d6d90aad6714adf3237dc44589169ea (diff) | |
merg
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) { |