diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-21 15:18:56 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-21 15:18:56 -0500 |
| commit | 55f1d95d978dd6ac38c9f77882399323567fb634 (patch) | |
| tree | 1824bd91af344b22c00aa1899856402f950e7340 /indra/llmessage/llcurl.h | |
| parent | 5dc8e44c767f839e3d2d1d926bfdeee969f2492e (diff) | |
| parent | ec06aa129f839cc98aaa8006d6467241281da9fa (diff) | |
merge changes for vmrg-210
Diffstat (limited to 'indra/llmessage/llcurl.h')
| -rw-r--r-- | indra/llmessage/llcurl.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h index a275db3e53..705cdcbbcc 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 @@ -298,6 +299,7 @@ public: S32 mQueued; S32 mErrorCount; + static CURLM* initMulti() ; private: void easyFree(LLCurl::Easy*); @@ -316,6 +318,9 @@ private: BOOL mDead ; LLMutex* mMutexp ; LLMutex* mDeletionMutexp ; + LLMutex* mEasyMutexp ; + + static LLMutex* sMultiInitMutexp ; }; class LLCurlThread : public LLQueuedThread |