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) { }

1 files changed, 169 insertions, 0 deletions

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");
+	}
+}
+