merge

1 files changed, 5 insertions, 3 deletions

diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp
index 90e8ff0aae..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)
 	{
@@ -1209,12 +1211,12 @@ void LLSecAPIBasicHandler::init()
 		// with the product
 		std::string ca_file_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "CA.pem");
 		llinfos << "app path " << ca_file_path << llendl;
-		LLBasicCertificateStore app_ca_store = LLBasicCertificateStore(ca_file_path);	
+		LLPointer<LLBasicCertificateStore> app_ca_store = new LLBasicCertificateStore(ca_file_path);
 		
 		// push the applicate CA files into the store, therefore adding any new CA certs that 
 		// updated
-		for(LLCertificateVector::iterator i = app_ca_store.begin();
-			i != app_ca_store.end();
+		for(LLCertificateVector::iterator i = app_ca_store->begin();
+			i != app_ca_store->end();
 			i++)
 		{
 			mStore->add(*i);