summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2007-11-07 22:55:27 +0000
committerSteven Bennetts <steve@lindenlab.com>2007-11-07 22:55:27 +0000
commit050dad0ce35207a4ac1562175e853590ad9b7681 (patch)
treebe5dc291d2313112e5733d8c004edfe67da6fc54 /indra/llmessage
parent6fd04521d720a3a4904069d10e8ed970d870ba7f (diff)
merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llcurl.cpp5
-rw-r--r--indra/llmessage/llcurl.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 01976b12f1..9b5e6cd4e6 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -367,6 +367,11 @@ LLCurl::getByteRange(const std::string& url, S32 offset, S32 length, ResponderPt
mainMulti()->getByteRange(url, offset, length, responder);
}
+void LLCurl::initClass()
+{
+ curl_global_init(CURL_GLOBAL_ALL);
+}
+
void
LLCurl::process()
{
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h
index d21cdc4e47..53287c2988 100644
--- a/indra/llmessage/llcurl.h
+++ b/indra/llmessage/llcurl.h
@@ -130,8 +130,9 @@ public:
static void get(const std::string& url, ResponderPtr);
static void getByteRange(const std::string& url, S32 offset, S32 length, ResponderPtr responder);
+ static void initClass(); // *NOTE:Mani - not thread safe!
static void process();
- static void cleanup();
+ static void cleanup(); // *NOTE:Mani - not thread safe!
};
namespace boost