livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-1546

meow-7.2.2
Oz Linden 2011-08-17 11:32:27 -04:00
parent ff2eb602a0 6a7bbe0159
commit b2ef0f9988
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llsecapi.h
View File

@ -160,7 +160,7 @@ public:
// base class for a list of certificates.
class LLCertificateVector : public LLRefCount
class LLCertificateVector : public LLThreadSafeRefCount
{
public:

6
indra/newview/llsechandler_basic.cpp
View File

@ -1209,12 +1209,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);