diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-17 11:32:27 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-17 11:32:27 -0400 |
| commit | b2ef0f99882db73680cc5dfb9570255414f7ba6d (patch) | |
| tree | b42e6459be311881c576c04c03ce36ec41cbe158 /indra/newview | |
| parent | ff2eb602a0b0f6c158d4903c686951166325f05d (diff) | |
| parent | 6a7bbe0159c3d92368d674cea9cf3057784ba848 (diff) | |
merge changes for storm-1546
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llsecapi.h | 2 | ||||
| -rw-r--r-- | indra/newview/llsechandler_basic.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llsecapi.h b/indra/newview/llsecapi.h index b65cf37e7f..8e4c2c56c6 100644 --- a/indra/newview/llsecapi.h +++ b/indra/newview/llsecapi.h @@ -160,7 +160,7 @@ public: // base class for a list of certificates. -class LLCertificateVector : public LLRefCount +class LLCertificateVector : public LLThreadSafeRefCount { public: diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp index 90e8ff0aae..904bb03270 100644 --- a/indra/newview/llsechandler_basic.cpp +++ b/indra/newview/llsechandler_basic.cpp @@ -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); |