diff -r 4ebbd04efd93 -r 4c939263b7e1 indra/newview/llsechandler_basic.cpp
--- a/indra/newview/llsechandler_basic.cpp	Mon Aug 22 09:57:55 2011 -0400
+++ b/indra/newview/llsechandler_basic.cpp	Tue Aug 23 14:45:42 2011 -0700
@@ -1005,6 +1005,8 @@
 									   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 -r 4ebbd04efd93 -r 4c939263b7e1 indra/newview/tests/llsechandler_basic_test.cpp
--- a/indra/newview/tests/llsechandler_basic_test.cpp	Mon Aug 22 09:57:55 2011 -0400
+++ b/indra/newview/tests/llsechandler_basic_test.cpp	Tue Aug 23 14:45:42 2011 -0700
@@ -86,6 +86,9 @@
 	return "";
 }
 
+// Stub for --no-verify-ssl-cert
+BOOL LLControlGroup::getBOOL(const std::string& name) { return FALSE; }
+
 LLSD LLCredential::getLoginParams()
 {
 	LLSD result = LLSD::emptyMap();