diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-22 14:56:03 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-22 14:56:03 -0400 |
| commit | 0a9d558cd02e8955415bbbaca20d57cd6eddab60 (patch) | |
| tree | dbbabbe705663dbbf6af85526d83dcb729fa91a3 /indra/llmessage | |
| parent | 75b2f617893f5712817f28282e517d3f70861613 (diff) | |
| parent | 627bd3c5b998b6a743b7b412235bc5a287dadfc4 (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) |