merge

1 files changed, 4 insertions, 1 deletions

diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h
index 8a65c783be..14a8e241b8 100755
--- a/indra/llmessage/llcurl.h
+++ b/indra/llmessage/llcurl.h
@@ -46,7 +46,7 @@
 #include "llqueuedthread.h"
 #include "llframetimer.h"
 #include "llpointer.h"
-
+#include "llsingleton.h"
 
 class LLMutex;
 class LLCurlThread;
@@ -222,6 +222,8 @@ public:
 	static CURL*  newEasyHandle() ;
 	static void   deleteEasyHandle(CURL* handle) ;
 
+	static CURL*	createStandardCurlHandle();
+
 private:
 	static std::string sCAPath;
 	static std::string sCAFile;
@@ -231,6 +233,7 @@ private:
 	static LLMutex* sHandleMutexp ;
 	static S32      sTotalHandles ;
 	static S32      sMaxHandles;
+	static CURL*	sCurlTemplateStandardHandle;
 public:
 	static bool     sNotQuitting;
 	static F32      sCurlRequestTimeOut;