diff options
author | Jacek Antonelli | 2010-02-08 17:01:00 -0600 |
---|---|---|
committer | Jacek Antonelli | 2010-02-08 17:01:00 -0600 |
commit | d96e672c7fa0cb59ef0c30163326bb40220e745a (patch) | |
tree | 0578f6258788f44f91dbf84eebdb09d994e2a0e5 /linden/indra/llmessage | |
parent | Fixed login screen only allowing 16 chars per name. (diff) | |
download | meta-impy-d96e672c7fa0cb59ef0c30163326bb40220e745a.zip meta-impy-d96e672c7fa0cb59ef0c30163326bb40220e745a.tar.gz meta-impy-d96e672c7fa0cb59ef0c30163326bb40220e745a.tar.bz2 meta-impy-d96e672c7fa0cb59ef0c30163326bb40220e745a.tar.xz |
Ported many APR changes from Snowglobe.
Diffstat (limited to 'linden/indra/llmessage')
-rw-r--r-- | linden/indra/llmessage/llcurl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llmessage/llcurl.cpp b/linden/indra/llmessage/llcurl.cpp index a4eb90d..811d4af 100644 --- a/linden/indra/llmessage/llcurl.cpp +++ b/linden/indra/llmessage/llcurl.cpp | |||
@@ -1002,7 +1002,7 @@ void LLCurl::initClass() | |||
1002 | S32 mutex_count = CRYPTO_num_locks(); | 1002 | S32 mutex_count = CRYPTO_num_locks(); |
1003 | for (S32 i=0; i<mutex_count; i++) | 1003 | for (S32 i=0; i<mutex_count; i++) |
1004 | { | 1004 | { |
1005 | sSSLMutex.push_back(new LLMutex(gAPRPoolp)); | 1005 | sSSLMutex.push_back(new LLMutex(NULL)); |
1006 | } | 1006 | } |
1007 | CRYPTO_set_id_callback(&LLCurl::ssl_thread_id); | 1007 | CRYPTO_set_id_callback(&LLCurl::ssl_thread_id); |
1008 | CRYPTO_set_locking_callback(&LLCurl::ssl_locking_callback); | 1008 | CRYPTO_set_locking_callback(&LLCurl::ssl_locking_callback); |