diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-12-15 21:39:48 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-12-15 21:39:48 -0700 |
| commit | efec138037d7271effd89536d824bec270985909 (patch) | |
| tree | 57c0f5165fcdb4d428bba8ab4cef6dcc401b7ece /indra/llmessage/llcurl.h | |
| parent | 16b6a472477bd389771fe4022e425f77ca85c2bd (diff) | |
fix for SH-2738 and SH-2777, might also help SH-2723: heap corruption
SH-2738: Texture fetching freezes due to LLcurl
SH-2777: viewer crashed on logout in LLCurl::Easy::releaseEasyHandle
Diffstat (limited to 'indra/llmessage/llcurl.h')
| -rw-r--r-- | indra/llmessage/llcurl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h index a275db3e53..5d54b5fe12 100644 --- a/indra/llmessage/llcurl.h +++ b/indra/llmessage/llcurl.h @@ -253,6 +253,7 @@ private: static std::set<CURL*> sFreeHandles; static std::set<CURL*> sActiveHandles; + static LLMutex* sHandleMutexp ; }; class LLCurl::Multi @@ -316,6 +317,7 @@ private: BOOL mDead ; LLMutex* mMutexp ; LLMutex* mDeletionMutexp ; + LLMutex* mEasyMutexp ; }; class LLCurlThread : public LLQueuedThread |