diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-17 16:19:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-17 16:19:57 -0400 |
| commit | 77dc594e79118769087c0e2094c303fc5aaea5d4 (patch) | |
| tree | ed538b0b4e1d0b1de7ecbf22f701bbb1595b967c /indra/llmessage/llcurl.cpp | |
| parent | 94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff) | |
| parent | 1afbdc79c6fb911a5ab2c87067e7b99bec92fbc6 (diff) | |
merge back late changes and tags from release branch
Diffstat (limited to 'indra/llmessage/llcurl.cpp')
| -rw-r--r-- | indra/llmessage/llcurl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index 6d9213f51b..330028c926 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -531,7 +531,7 @@ LLCurl::Multi::Multi() mThreaded = LLCurl::sMultiThreaded && LLThread::currentID() == sMainThreadID; if (mThreaded) { - mSignal = new LLCondition(); + mSignal = new LLCondition(NULL); } else { @@ -1189,14 +1189,14 @@ void LLCurl::initClass(bool multi_threaded) check_curl_code(code); - Easy::sHandleMutex = new LLMutex(); - Easy::sMultiMutex = new LLMutex(); + Easy::sHandleMutex = new LLMutex(NULL); + Easy::sMultiMutex = new LLMutex(NULL); #if SAFE_SSL S32 mutex_count = CRYPTO_num_locks(); for (S32 i=0; i<mutex_count; i++) { - sSSLMutex.push_back(new LLMutex); + sSSLMutex.push_back(new LLMutex(NULL)); } CRYPTO_set_id_callback(&LLCurl::ssl_thread_id); CRYPTO_set_locking_callback(&LLCurl::ssl_locking_callback); |