diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-26 10:03:28 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-26 10:03:28 -0400 |
| commit | d45995b80d6d90aad6714adf3237dc44589169ea (patch) | |
| tree | abf7bbd86f5316fce69341fb2ce395dd63101513 /indra/newview | |
| parent | 6f009080b9f8c9b5211288f6fe29cb326ac8bf23 (diff) | |
| parent | c7141025c85ebabc0447a7d7c6f580c2e6c47f74 (diff) | |
merge changes for storm-1568
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llsechandler_basic.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/tests/llsechandler_basic_test.cpp | 3 |
2 files changed, 5 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) { diff --git a/indra/newview/tests/llsechandler_basic_test.cpp b/indra/newview/tests/llsechandler_basic_test.cpp index daa10819fc..0235400976 100644 --- a/indra/newview/tests/llsechandler_basic_test.cpp +++ b/indra/newview/tests/llsechandler_basic_test.cpp @@ -86,6 +86,9 @@ std::string LLControlGroup::getString(const std::string& name) return ""; } +// Stub for --no-verify-ssl-cert +BOOL LLControlGroup::getBOOL(const std::string& name) { return FALSE; } + LLSD LLCredential::getLoginParams() { LLSD result = LLSD::emptyMap(); |