diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-21 13:49:32 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-21 13:49:32 -0400 |
| commit | 1b5937c06b4f4137a054758b3a8a4bedc014a802 (patch) | |
| tree | 4ef87f2480b89646de06637b04947f10aacba1cc /indra | |
| parent | e85ae35ff9bee4a8ba346c285192ccf77269a2db (diff) | |
| parent | 83732a7083ef50ddbf2c0e1e99aed8fe65c6a63a (diff) | |
merge changes for storm-1618
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmessage/llcurl.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index 280a8942a8..6d9213f51b 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -553,6 +553,11 @@ LLCurl::Multi::~Multi() { llassert(isStopped()); + if (LLCurl::sMultiThreaded) + { + LLCurl::Easy::sMultiMutex->lock(); + } + delete mSignal; mSignal = NULL; @@ -573,6 +578,11 @@ LLCurl::Multi::~Multi() check_curl_multi_code(curl_multi_cleanup(mCurlMultiHandle)); --gCurlMultiCount; + + if (LLCurl::sMultiThreaded) + { + LLCurl::Easy::sMultiMutex->unlock(); + } } CURLMsg* LLCurl::Multi::info_read(S32* msgs_in_queue) |