summaryrefslogtreecommitdiff
path: root/indra/llmessage/llcurl.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-01-04 09:59:57 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-01-04 09:59:57 -0500
commita3e30250e8dc16d976e1df5d50bfdca28aec6d7e (patch)
tree6269e0d5a461c4cde9cc07f2d1f54a1eb3f4e036 /indra/llmessage/llcurl.h
parent1620ad6d00a77b2089e0ae5f6de30f9a954c6167 (diff)
parent570d562f5871f40bd7f8c683db5316ffd0133335 (diff)
merge
Diffstat (limited to 'indra/llmessage/llcurl.h')
-rw-r--r--indra/llmessage/llcurl.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h
index eb814bc608..9c2c215c7a 100644
--- a/indra/llmessage/llcurl.h
+++ b/indra/llmessage/llcurl.h
@@ -299,6 +299,7 @@ public:
S32 mQueued;
S32 mErrorCount;
+ static CURLM* initMulti() ;
private:
void easyFree(LLCurl::Easy*);
@@ -318,6 +319,8 @@ private:
LLMutex* mMutexp ;
LLMutex* mDeletionMutexp ;
LLMutex* mEasyMutexp ;
+
+ static LLMutex* sMultiInitMutexp ;
};
class LLCurlThread : public LLQueuedThread