diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-04 15:42:30 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-04 15:42:30 -0800 |
| commit | 6fed3bed60c2b721ff26c319a86cd5f26afe084f (patch) | |
| tree | 09aa24e713feaf4000b4ccaf84824ded94135ecc /indra/llmessage/llcurl.h | |
| parent | 1c4474f8945316118870d7d8389d6bfb619ad239 (diff) | |
| parent | 570d562f5871f40bd7f8c683db5316ffd0133335 (diff) | |
Merge from viewer-development
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 |