Merged in oz_linden/maint-5974

1 files changed, 4 insertions, 2 deletions

diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index 348b09b992..133db620e6 100755
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -50,7 +50,6 @@
 #include "lltimer.h"
 #include "llpacketring.h"
 #include "llhost.h"
-#include "llcurl.h"
 #include "llhttpnode.h"
 //#include "llpacketack.h"
 #include "llsingleton.h"
@@ -60,6 +59,7 @@
 #include "llmessagesenderinterface.h"
 
 #include "llstoredmessage.h"
+#include "boost/function.hpp"
 
 const U32 MESSAGE_MAX_STRINGS_LENGTH = 64;
 const U32 MESSAGE_NUMBER_OF_HASH_BUCKETS = 8192;
@@ -489,7 +489,6 @@ public:
 		void (*callback)(void **,S32), 
 		void ** callback_data);
 
-	LLCurl::ResponderPtr createResponder(const std::string& name);
 	S32		sendMessage(const LLHost &host);
 	S32		sendMessage(const U32 circuit);
 private:
@@ -740,6 +739,9 @@ public:
 	void receivedMessageFromTrustedSender();
 	
 private:
+    typedef boost::function<void(S32)>  UntrustedCallback_t;
+    void sendUntrustedSimulatorMessageCoro(std::string url, std::string message, LLSD body, UntrustedCallback_t callback);
+
 
 	bool mLastMessageFromTrustedMessageService;