MAINT-5506: Converted llmessage untrusted sim message responder to coroutine.

Removed HTTPSender, HTTPNullSender, HTTPCapSender.
Moved UntrustedMessageCap storage into LLHost
Added boost libraries to PROJECT_x_TEST linkage.

5 files changed, 6 insertions, 118 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 4a91969bb7..3a6a1d4d64 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -140,7 +140,6 @@ set(viewer_SOURCE_FILES
     llbuycurrencyhtml.cpp
     llcallbacklist.cpp
     llcallingcard.cpp
-    llcaphttpsender.cpp
     llchannelmanager.cpp
     llchatbar.cpp
     llchathistory.cpp
@@ -751,7 +750,6 @@ set(viewer_HEADER_FILES
     llcallbacklist.h
     llcallingcard.h
     llcapabilityprovider.h
-    llcaphttpsender.h
     llchannelmanager.h
     llchatbar.h
     llchathistory.h
diff --git a/indra/newview/llcaphttpsender.cpp b/indra/newview/llcaphttpsender.cpp
deleted file mode 100755
index b2524d14f8..0000000000
--- a/indra/newview/llcaphttpsender.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/** 
- * @file llcaphttpsender.cpp
- * @brief Abstracts details of sending messages via UntrustedMessage cap.
- *
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llcaphttpsender.h"
-
-#include "llhost.h"
-
-LLCapHTTPSender::LLCapHTTPSender(const std::string& cap) :
-	mCap(cap)
-{
-}
-
-//virtual 
-void LLCapHTTPSender::send(const LLHost& host, const std::string& message, 
-								  const LLSD& body, 
-								  LLHTTPClient::ResponderPtr response) const
-{
-	LL_INFOS() << "LLCapHTTPSender::send: message " << message
-			<< " to host " << host << LL_ENDL;
-	LLSD llsd;
-	llsd["message"] = message;
-	llsd["body"] = body;
-	LLHTTPClient::post(mCap, llsd, response);
-}
diff --git a/indra/newview/llcaphttpsender.h b/indra/newview/llcaphttpsender.h
deleted file mode 100755
index e1f4c813f6..0000000000
--- a/indra/newview/llcaphttpsender.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/** 
- * @file llcaphttpsender.h
- * @brief Abstracts details of sending messages via the
- *        UntrustedMessage capability.
- *
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_CAP_HTTP_SENDER_H
-#define LL_CAP_HTTP_SENDER_H
-
-#include "llhttpsender.h"
-
-class LLCapHTTPSender : public LLHTTPSender
-{
-public:
-	LLCapHTTPSender(const std::string& cap);
-
-	/** @brief Send message via UntrustedMessage capability with body,
-		call response when done */ 
-	virtual void send(const LLHost& host, 
-					  const std::string& message, const LLSD& body, 
-					  LLHTTPClient::ResponderPtr response) const;
-
-private:
-	std::string mCap;
-};
-
-#endif // LL_CAP_HTTP_SENDER_H
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 6622fa7d9c..8f856b1300 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -56,7 +56,6 @@
 #include "llerrorcontrol.h"
 #include "llfloaterreg.h"
 #include "llfocusmgr.h"
-#include "llhttpsender.h"
 #include "llfloaterimsession.h"
 #include "lllocationhistory.h"
 #include "llimageworker.h"
@@ -291,20 +290,6 @@ void callback_cache_name(const LLUUID& id, const std::string& full_name, bool is
 // local classes
 //
 
-namespace
-{
-	class LLNullHTTPSender : public LLHTTPSender
-	{
-		virtual void send(const LLHost& host, 
-						  const std::string& message, const LLSD& body, 
-						  LLHTTPClient::ResponderPtr response) const
-		{
-			LL_WARNS("AppInit") << " attemped to send " << message << " to " << host
-					<< " with null sender" << LL_ENDL;
-		}
-	};
-}
-
 void update_texture_fetch()
 {
 	LLAppViewer::getTextureCache()->update(1); // unpauses the texture cache thread
@@ -510,8 +495,6 @@ bool idle_startup()
 			    port = gSavedSettings.getU32("ConnectionPort");
 			  }
 
-			LLHTTPSender::setDefaultSender(new LLNullHTTPSender());
-
 			// TODO parameterize 
 			const F32 circuit_heartbeat_interval = 5;
 			const F32 circuit_timeout = 100;
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 32b57dae25..cb42110510 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -47,7 +47,6 @@
 #include "llagentcamera.h"
 #include "llavatarrenderinfoaccountant.h"
 #include "llcallingcard.h"
-#include "llcaphttpsender.h"
 #include "llcommandhandler.h"
 #include "lldir.h"
 #include "lleventpoll.h"
@@ -611,8 +610,9 @@ LLViewerRegion::~LLViewerRegion()
 	delete mParcelOverlay;
 	delete mImpl->mLandp;
 	delete mImpl->mEventPoll;
+#if 0
 	LLHTTPSender::clearSender(mImpl->mHost);
-	
+#endif	
 	std::for_each(mImpl->mObjectPartition.begin(), mImpl->mObjectPartition.end(), DeletePointer());
 
 	saveObjectCache();
@@ -2941,7 +2941,11 @@ void LLViewerRegion::setCapability(const std::string& name, const std::string& u
 	}
 	else if(name == "UntrustedSimulatorMessage")
 	{
+#if 1
+        mImpl->mHost.setUntrustedSimulatorCap(url);
+#else
 		LLHTTPSender::setSender(mImpl->mHost, new LLCapHTTPSender(url));
+#endif
 	}
 	else if (name == "SimulatorFeatures")
 	{