diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-09-26 13:08:13 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-09-26 13:08:13 -0400 |
| commit | 1ead58914837f12e943ff1db4b71cd3ed379d01c (patch) | |
| tree | dbb6678b4b519e543deb3c344174888b99b4ccd7 /indra/llmessage | |
| parent | 5b7b3cbbbbec439880a33af8944d10c7bb527c3a (diff) | |
| parent | d475a96e94be90e68cf34bf6c25d8ab259aa47b5 (diff) | |
Merge
Diffstat (limited to 'indra/llmessage')
| -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) |