svn merge -r108815:112761 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26

The biggest things in this are Scalable Space Servers and Maint-Server-6

QAR-1209 : SSS
QAR-1295 : maint-server-6

Conflicts resolved by prospero:

C    scripts/farm_distribute

C    scripts/automated_build_scripts/build-linux.sh : resolved by
                     prospero, mostly kept the merge-right version in
                     the conflict, but there was one block of repeated
                     code from earlier that I removed.

C    scripts/automated_build_scripts/build-mac.sh : kept merge-right

C    indra/llcommon/llversionserver.h : svn revert

C    indra/newsim/llsimparcel.h : kept *both*... working had "setArea",
                    merge-right had exportStream and importStream

C    indra/newsim/llsimparcel.cpp : see llsimparcel.h

C    indra/newsim/lltask.h : working had LLTask derived also from
                   LLScriptResourceConsumer, merge-right had LLTask
                   dervied also from LLAgentPosition.  To resolve
                   conflict, derive from both.

C    indra/newsim/lllslmanager.h : kept merge-right (had an added comment)

C    indra/llmessage/llhttpnode.h : kept working (added the definition
                   of method LLHTTPNode::extendedResult)

C    indra/lscript/lscript_execute_mono/llscriptexecutemono.cpp
C    indra/lscript/lscript_execute_mono/llscriptexecutemono.h
                  : These two were resolved by si, in consultation with daveh


I also had to add the following stubs to
indra/newsim/tests/llgodkickutils_test.cpp in order to get it to
compile:

  // LLScriptResourceConsumer interface methods in LLTask
  LLScriptResource::LLScriptResource() { }
  LLScriptResourcePool::LLScriptResourcePool() { }
  LLScriptResourcePool LLScriptResourcePool::null;

  LLScriptResourceConsumer::LLScriptResourceConsumer() { }
  LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() { return LLScriptResourcePool::null; }
  const LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() const { return LLScriptResourcePool::null; }
  bool LLScriptResourceConsumer::switchScriptResourcePools(LLScriptResourcePool& new_pool) { return false; }
  bool LLScriptResourceConsumer::canUseScriptResourcePool(const LLScriptResourcePool& resource_pool) { return false; }
  bool LLScriptResourceConsumer::isInPool(const LLScriptResourcePool& resource_pool) { return false; }
  void LLScriptResourceConsumer::setScriptResourcePool(LLScriptResourcePool& pool) { }

  S32 LLTask::getUsedPublicURLs() const { return 0; }
  void LLTask::setScriptResourcePool(LLScriptResourcePool& pool) { }

8 files changed, 753 insertions, 0 deletions

diff --git a/indra/llmessage/tests/llcurl_stub.cpp b/indra/llmessage/tests/llcurl_stub.cpp
new file mode 100644
index 0000000000..9d1d3fa221
--- /dev/null
+++ b/indra/llmessage/tests/llcurl_stub.cpp
@@ -0,0 +1,88 @@
+/**
+ * @file llcurl_stub.cpp
+ * @brief stub class to allow unit testing
+ *
+ * $LicenseInfo:firstyear=2008&license=internal$
+ *
+ * Copyright (c) 2008, Linden Research, Inc.
+ *
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") { }
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+LLCurl::Responder::Responder()
+{
+}
+
+void LLCurl::Responder::completed(U32 status, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const &reason,
+								  LLSD const& mContent)
+{
+	if (isGoodStatus(status))
+	{
+		result(mContent);
+	}
+	else
+	{
+		error(status, reason, mContent);
+	}
+}
+
+void LLCurl::Responder::completedHeader(unsigned,
+										std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&,
+										LLSD const&)
+{
+}
+
+void LLCurl::Responder::completedRaw(unsigned,
+									 std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&,
+									 LLChannelDescriptors const&,
+									 boost::shared_ptr<LLBufferArray> const&)
+{
+}
+
+void LLCurl::Responder::error(unsigned,
+							  std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&,
+							  LLSD const&)
+{
+}
+
+LLCurl::Responder::~Responder ()
+{
+}
+
+void LLCurl::Responder::error(unsigned,
+							  std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
+{
+}
+
+void LLCurl::Responder::result(LLSD const&)
+{
+}
+
+namespace boost
+{
+	void intrusive_ptr_add_ref(LLCurl::Responder* p)
+	{
+		++p->mReferenceCount;
+	}
+
+	void intrusive_ptr_release(LLCurl::Responder* p)
+	{
+		if(p && 0 == --p->mReferenceCount)
+		{
+			delete p;
+		}
+	}
+};
+
diff --git a/indra/llmessage/tests/llhttpclientadapter_test.cpp b/indra/llmessage/tests/llhttpclientadapter_test.cpp
new file mode 100644
index 0000000000..bde76db08b
--- /dev/null
+++ b/indra/llmessage/tests/llhttpclientadapter_test.cpp
@@ -0,0 +1,169 @@
+/** 
+ * @file 
+ * @brief 
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llhttpclientadapter.h"
+
+#include "../test/lltut.h"
+#include "llhttpclient.h"
+#include "llcurl_stub.cpp"
+
+float const HTTP_REQUEST_EXPIRY_SECS = 1.0F;
+
+std::vector<std::string> get_urls;
+std::vector<boost::intrusive_ptr<LLCurl::Responder> > get_responders;
+void LLHTTPClient::get(const std::string& url, boost::intrusive_ptr<LLCurl::Responder> responder, const LLSD& headers, const F32 timeout)
+{
+	get_urls.push_back(url);
+	get_responders.push_back(responder);
+}
+
+std::vector<std::string> put_urls;
+std::vector<LLSD> put_body;
+std::vector<boost::intrusive_ptr<LLCurl::Responder> > put_responders;
+
+void LLHTTPClient::put(std::string const &url, LLSD const &body, boost::intrusive_ptr<LLCurl::Responder> responder,float) 
+{
+	put_urls.push_back(url);
+	put_responders.push_back(responder);
+	put_body.push_back(body);
+
+}
+
+
+namespace tut
+{
+	struct LLHTTPClientAdapterData
+	{
+		LLHTTPClientAdapterData()
+		{
+			get_urls.clear();
+			get_responders.clear();
+			put_urls.clear();
+			put_responders.clear();
+			put_body.clear();
+		}
+	};
+
+	typedef test_group<LLHTTPClientAdapterData> factory;
+	typedef factory::object object;
+}
+
+namespace
+{
+	tut::factory tf("LLHTTPClientAdapterData test");
+}
+
+namespace tut
+{
+	// Ensure we can create the object
+	template<> template<>
+	void object::test<1>()
+	{
+		LLHTTPClientAdapter adapter;
+	}
+
+	// Does the get pass the appropriate arguments to the LLHTTPClient
+	template<> template<>
+	void object::test<2>()
+	{
+		LLHTTPClientAdapter adapter;
+
+		boost::intrusive_ptr<LLCurl::Responder> responder = new LLCurl::Responder();
+
+		adapter.get("Made up URL", responder);
+		ensure_equals(get_urls.size(), 1);
+		ensure_equals(get_urls[0], "Made up URL");
+	}
+
+	// Ensure the responder matches the one passed to get
+	template<> template<>
+	void object::test<3>()
+	{
+		LLHTTPClientAdapter adapter;
+		boost::intrusive_ptr<LLCurl::Responder> responder = new LLCurl::Responder();
+
+		adapter.get("Made up URL", responder);
+
+		ensure_equals(get_responders.size(), 1);
+		ensure_equals(get_responders[0].get(), responder.get());
+	}
+	
+	// Ensure the correct url is used in the put
+	template<> template<>
+	void object::test<4>()
+	{
+		LLHTTPClientAdapter adapter;
+
+		boost::intrusive_ptr<LLCurl::Responder> responder = new LLCurl::Responder();
+
+		LLSD body;
+		body["TestBody"] = "Foobar";
+
+		adapter.put("Made up URL", body, responder);
+		ensure_equals(put_urls.size(), 1);
+		ensure_equals(put_urls[0], "Made up URL");
+	}
+
+	// Ensure the correct responder is used by put
+	template<> template<>
+	void object::test<5>()
+	{
+		LLHTTPClientAdapter adapter;
+
+		boost::intrusive_ptr<LLCurl::Responder> responder = new LLCurl::Responder();
+
+		LLSD body;
+		body["TestBody"] = "Foobar";
+
+		adapter.put("Made up URL", body, responder);
+
+		ensure_equals(put_responders.size(), 1);
+		ensure_equals(put_responders[0].get(), responder.get());
+	}
+
+	// Ensure the message body is passed through the put properly
+	template<> template<>
+	void object::test<6>()
+	{
+		LLHTTPClientAdapter adapter;
+
+		boost::intrusive_ptr<LLCurl::Responder> responder = new LLCurl::Responder();
+
+		LLSD body;
+		body["TestBody"] = "Foobar";
+
+		adapter.put("Made up URL", body, responder);
+
+		ensure_equals(put_body.size(), 1);
+		ensure_equals(put_body[0]["TestBody"].asString(), "Foobar");
+	}
+}
+
diff --git a/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp b/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp
new file mode 100644
index 0000000000..a6f5659352
--- /dev/null
+++ b/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp
@@ -0,0 +1,164 @@
+/**
+ * @file lltrustedmessageservice_test.cpp
+ * @brief LLTrustedMessageService unit tests
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlife.com/developers/opensource/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "lltemplatemessagedispatcher.h"
+#include "lltut.h"
+
+#include "llhttpnode.h"
+#include "llhost.h"
+#include "message.h"
+#include "llsd.h"
+
+#include "llhost.cpp" // Needed for copy operator
+#include "net.cpp" // Needed by LLHost.
+
+LLMessageSystem * gMessageSystem = NULL;
+
+// sensor test doubles
+bool gClearRecvWasCalled = false;
+void LLMessageSystem::clearReceiveState(void) 
+{ 
+	gClearRecvWasCalled = true; 
+}
+
+char gUdpDispatchedData[MAX_BUFFER_SIZE];
+bool gUdpDispatchWasCalled = false;
+BOOL LLTemplateMessageReader::readMessage(const U8* data,class LLHost const &) 
+{ 
+	gUdpDispatchWasCalled = true;
+	strcpy(gUdpDispatchedData, reinterpret_cast<const char*>(data));
+	return  true;
+}
+
+BOOL gValidateMessage = FALSE;
+BOOL LLTemplateMessageReader::validateMessage(const U8*, S32 buffer_size, LLHost const &sender, bool trusted) 
+{ 
+	return gValidateMessage;
+}
+
+LLHost host;
+const LLHost& LLMessageSystem::getSender() const 
+{ 
+	return host; 
+}
+
+const char* gBinaryTemplateData = "BINARYTEMPLATEDATA";
+void fillVector(std::vector<U8>& vector_data, const char* data)
+{
+	vector_data.resize(strlen(data) + 1);
+	strcpy(reinterpret_cast<char*>(&vector_data[0]), data);
+}
+
+namespace tut
+{
+		static LLTemplateMessageReader::message_template_number_map_t numberMap;
+
+		struct LLTemplateMessageDispatcherData
+		{
+			LLTemplateMessageDispatcherData()
+			{
+				mMessageName = "MessageName";
+				gUdpDispatchWasCalled = false;
+				gClearRecvWasCalled = false;
+				gValidateMessage = FALSE;
+				mMessage["body"]["binary-template-data"] = std::vector<U8>();
+			}
+
+			LLSD mMessage;
+			LLHTTPNode::ResponsePtr mResponsePtr;
+			std::string mMessageName;
+		};
+
+	typedef test_group<LLTemplateMessageDispatcherData> factory;
+	typedef factory::object object;
+}
+
+namespace
+{
+	tut::factory tf("LLTemplateMessageDispatcher test");
+}
+
+namespace tut
+{
+	// does an empty message stop processing?
+	template<> template<>
+	void object::test<1>()
+	{
+		LLTemplateMessageReader* pReader = NULL;
+		LLTemplateMessageDispatcher t(*pReader);
+		t.dispatch(mMessageName, mMessage, mResponsePtr);
+		ensure(! gUdpDispatchWasCalled);
+		ensure(! gClearRecvWasCalled);
+	}
+
+	// does the disaptch invoke the udp send method?
+	template<> template<>
+	void object::test<2>()
+	{
+		LLTemplateMessageReader* pReader = NULL;
+		LLTemplateMessageDispatcher t(*pReader);
+		gValidateMessage = TRUE;
+		std::vector<U8> vector_data;
+		fillVector(vector_data, gBinaryTemplateData);		
+		mMessage["body"]["binary-template-data"] = vector_data;
+		t.dispatch(mMessageName, mMessage, mResponsePtr);
+		ensure("udp dispatch was called", gUdpDispatchWasCalled);
+	}
+
+	// what if the message wasn't valid? We would hope the message gets cleared!
+	template<> template<>
+	void object::test<3>()
+	{
+		LLTemplateMessageReader* pReader = NULL;
+		LLTemplateMessageDispatcher t(*pReader);
+		std::vector<U8> vector_data;
+		fillVector(vector_data, gBinaryTemplateData);
+		mMessage["body"]["binary-template-data"] = vector_data;
+		gValidateMessage = FALSE;
+		t.dispatch(mMessageName, mMessage, mResponsePtr);
+		ensure("clear received message was called", gClearRecvWasCalled);
+	}
+
+	// is the binary data passed through correctly?
+	template<> template<>
+	void object::test<4>()
+	{
+		LLTemplateMessageReader* pReader = NULL;
+		LLTemplateMessageDispatcher t(*pReader);
+		gValidateMessage = TRUE;
+		std::vector<U8> vector_data;
+		fillVector(vector_data, gBinaryTemplateData);
+		mMessage["body"]["binary-template-data"] = vector_data;
+		t.dispatch(mMessageName, mMessage, mResponsePtr);
+		ensure("data couriered correctly", strcmp(gBinaryTemplateData, gUdpDispatchedData) == 0);
+	}
+}
+
diff --git a/indra/llmessage/tests/lltesthttpclientadapter.cpp b/indra/llmessage/tests/lltesthttpclientadapter.cpp
new file mode 100644
index 0000000000..1140458918
--- /dev/null
+++ b/indra/llmessage/tests/lltesthttpclientadapter.cpp
@@ -0,0 +1,56 @@
+/** 
+ * @file 
+ * @brief 
+ *
+ * $LicenseInfo:firstyear=2008&license=internal$
+ * 
+ * Copyright (c) 2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "lltesthttpclientadapter.h"
+
+LLTestHTTPClientAdapter::LLTestHTTPClientAdapter()
+{
+}
+
+LLTestHTTPClientAdapter::~LLTestHTTPClientAdapter()
+{
+}
+
+void LLTestHTTPClientAdapter::get(const std::string& url, LLCurl::ResponderPtr responder)
+{
+	mGetUrl.push_back(url);
+	mGetResponder.push_back(responder);
+}
+
+void LLTestHTTPClientAdapter::put(const std::string& url, const LLSD& body, LLCurl::ResponderPtr responder)
+{
+	mPutUrl.push_back(url);
+	mPutBody.push_back(body);
+	mPutResponder.push_back(responder);
+}
+
+U32 LLTestHTTPClientAdapter::putCalls() const 
+{ 
+	return mPutUrl.size(); 
+}
+
+void LLTestHTTPClientAdapter::get(const std::string& url, LLCurl::ResponderPtr responder, const LLSD& headers)
+{
+	mGetUrl.push_back(url);
+	mGetHeaders.push_back(headers);
+	mGetResponder.push_back(responder);
+}
+
+
diff --git a/indra/llmessage/tests/lltesthttpclientadapter.h b/indra/llmessage/tests/lltesthttpclientadapter.h
new file mode 100644
index 0000000000..d032503685
--- /dev/null
+++ b/indra/llmessage/tests/lltesthttpclientadapter.h
@@ -0,0 +1,52 @@
+/** 
+ * @file 
+ * @brief 
+ *
+ * $LicenseInfo:firstyear=2008&license=internal$
+ * 
+ * Copyright (c) 2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+/* Macro Definitions */
+#ifndef LL_LLTESTHTTPCLIENTADAPTER_H
+#define LL_LLTESTHTTPCLIENTADAPTER_H
+
+
+#include "linden_common.h"
+#include "llhttpclientinterface.h"
+
+class LLTestHTTPClientAdapter : public LLHTTPClientInterface
+{
+public:
+	LLTestHTTPClientAdapter();
+	virtual ~LLTestHTTPClientAdapter();
+	virtual void get(const std::string& url, LLCurl::ResponderPtr responder);
+	virtual void get(const std::string& url, LLCurl::ResponderPtr responder, const LLSD& headers);
+
+	virtual void put(const std::string& url, const LLSD& body, LLCurl::ResponderPtr responder);
+	U32 putCalls() const;
+
+	std::vector<LLSD> mPutBody;
+	std::vector<LLSD> mGetHeaders;
+	std::vector<std::string> mPutUrl;
+	std::vector<std::string> mGetUrl;
+	std::vector<LLCurl::ResponderPtr> mPutResponder;
+	std::vector<LLCurl::ResponderPtr> mGetResponder;
+};
+
+
+
+#endif //LL_LLSIMULATORPRESENCESENDER_H
+
diff --git a/indra/llmessage/tests/lltestmessagesender.cpp b/indra/llmessage/tests/lltestmessagesender.cpp
new file mode 100644
index 0000000000..a37aa4c566
--- /dev/null
+++ b/indra/llmessage/tests/lltestmessagesender.cpp
@@ -0,0 +1,33 @@
+/** 
+ * @file 
+ * @brief 
+ *
+ * $LicenseInfo:firstyear=2008&license=internal$
+ * 
+ * Copyright (c) 2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "lltestmessagesender.h"
+
+LLTestMessageSender::~LLTestMessageSender()
+{
+}
+
+
+S32 LLTestMessageSender::sendMessage(const LLHost& host, LLStoredMessagePtr message)
+{
+	mSendHosts.push_back(host);
+	mSendMessages.push_back(message);
+	return 0;
+}
diff --git a/indra/llmessage/tests/lltestmessagesender.h b/indra/llmessage/tests/lltestmessagesender.h
new file mode 100644
index 0000000000..83c0eff4d3
--- /dev/null
+++ b/indra/llmessage/tests/lltestmessagesender.h
@@ -0,0 +1,46 @@
+/** 
+ * @file 
+ * @brief 
+ *
+ * $LicenseInfo:firstyear=2008&license=internal$
+ * 
+ * Copyright (c) 2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+/* Macro Definitions */
+#ifndef LL_LLTESTMESSAGESENDER_H
+#define LL_LLTESTMESSAGESENDER_H
+
+
+#include "linden_common.h"
+#include "llmessagesenderinterface.h"
+#include <vector>
+
+
+
+class LLTestMessageSender : public LLMessageSenderInterface
+{
+public:
+	virtual ~LLTestMessageSender();
+	virtual S32 sendMessage(const LLHost& host, LLStoredMessagePtr message);
+
+	std::vector<LLHost> mSendHosts;
+	std::vector<LLStoredMessagePtr> mSendMessages;
+};
+
+
+
+#endif //LL_LLTESTMESSAGESENDER_H
+
diff --git a/indra/llmessage/tests/lltrustedmessageservice_test.cpp b/indra/llmessage/tests/lltrustedmessageservice_test.cpp
new file mode 100644
index 0000000000..44595391df
--- /dev/null
+++ b/indra/llmessage/tests/lltrustedmessageservice_test.cpp
@@ -0,0 +1,145 @@
+/**
+ * @file lltrustedmessageservice_test.cpp
+ * @brief LLTrustedMessageService unit tests
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlife.com/developers/opensource/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "lltrustedmessageservice.h"
+#include "../test/lltut.h"
+
+#include "llhost.cpp" // LLHost is a value type for test purposes.
+#include "net.cpp" // Needed by LLHost.
+
+#include "message.h"
+#include "llmessageconfig.h"
+
+LLMessageSystem* gMessageSystem = NULL;
+
+LLMessageConfig::SenderTrust
+LLMessageConfig::getSenderTrustedness(const std::string& msg_name)
+{
+	return LLMessageConfig::NOT_SET;
+}
+
+void LLMessageSystem::receivedMessageFromTrustedSender()
+{
+}
+
+bool LLMessageSystem::isTrustedSender(const LLHost& host) const
+{
+	return false;
+}
+
+bool LLMessageSystem::isTrustedMessage(const std::string& name) const
+{
+	return false;
+}
+
+bool messageDispatched = false;
+bool messageDispatchedAsBinary = false;
+LLSD lastLLSD;
+std::string lastMessageName;
+
+void LLMessageSystem::dispatch(const std::string& msg_name,
+							   const LLSD& message,
+							   LLHTTPNode::ResponsePtr responsep)
+{
+	messageDispatched = true;
+	lastLLSD = message;
+	lastMessageName = msg_name;
+}
+
+void LLMessageSystem::dispatchTemplate(const std::string& msg_name,
+						 const LLSD& message,
+						 LLHTTPNode::ResponsePtr responsep)
+{
+	lastLLSD = message;
+	lastMessageName = msg_name;
+	messageDispatchedAsBinary = true;
+}
+
+namespace tut
+{
+	    struct LLTrustedMessageServiceData
+		{
+			LLTrustedMessageServiceData()
+			{
+				LLSD emptyLLSD;
+				lastLLSD = emptyLLSD;
+				lastMessageName = "uninitialised message name";
+				messageDispatched = false;
+				messageDispatchedAsBinary = false;
+			}
+		};
+
+	typedef test_group<LLTrustedMessageServiceData> factory;
+	typedef factory::object object;
+}
+
+namespace
+{
+	tut::factory tf("LLTrustedMessageServiceData test");
+}
+
+namespace tut
+{
+	// characterisation tests
+
+	// 1) test that messages get forwarded with names etc. as current behaviour (something like LLMessageSystem::dispatch(name, data...)
+
+	// test llsd messages are sent as normal using LLMessageSystem::dispatch() (eventually)
+	template<> template<>
+	void object::test<1>()
+	{
+		LLHTTPNode::ResponsePtr response;
+		LLSD input;
+		LLSD context;
+		LLTrustedMessageService adapter;
+		adapter.post(response, context, input);
+		// test original ting got called wit nowt, ya get me blood?
+		ensure_equals(messageDispatched, true);
+		ensure(lastLLSD.has("body"));
+	}
+
+	// test that llsd wrapped binary-template-data messages are 
+	// sent via LLMessageSystem::binaryDispatch() or similar
+	template<> template<>
+	void object::test<2>()
+	{
+		LLHTTPNode::ResponsePtr response;
+		LLSD input;
+		input["binary-template-data"] = "10001010110"; //make me a message here.
+		LLSD context;
+		LLTrustedMessageService adapter;
+
+		adapter.post(response, context, input);
+		ensure("check template-binary-data message was dispatched as binary", messageDispatchedAsBinary);
+		ensure_equals(lastLLSD["body"]["binary-template-data"].asString(),  "10001010110");
+		// test somit got called with "10001010110" (something like LLMessageSystem::dispatchTemplate(blah))
+	}
+}