Automated merge with tip of viewer-release

43 files changed, 0 insertions, 200 deletions

diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 229cb8e5a0..55442b2521 100755..100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -10,7 +10,6 @@ include(LLMath)
 include(LLMessage)
 include(LLVFS)
 include(LLXML)
-include(LScript)
 include(Linking)
 include(Tut)
 include(LLAddBuildTest)
@@ -49,7 +48,6 @@ set(test_SOURCE_FILES
     llpermissions_tut.cpp
     llpipeutil.cpp
     llsaleinfo_tut.cpp
-    llscriptresource_tut.cpp
     llsdmessagebuilder_tut.cpp
     llsdmessagereader_tut.cpp
     llsd_new_tut.cpp
diff --git a/indra/test/blowfish.digits.txt b/indra/test/blowfish.digits.txt
index fce1fed943..fce1fed943 100755..100644
--- a/indra/test/blowfish.digits.txt
+++ b/indra/test/blowfish.digits.txt
diff --git a/indra/test/catch_and_store_what_in.h b/indra/test/catch_and_store_what_in.h
index 59f8cc0085..59f8cc0085 100755..100644
--- a/indra/test/catch_and_store_what_in.h
+++ b/indra/test/catch_and_store_what_in.h
diff --git a/indra/test/debug.h b/indra/test/debug.h
index d61eba651b..d61eba651b 100755..100644
--- a/indra/test/debug.h
+++ b/indra/test/debug.h
diff --git a/indra/test/io.cpp b/indra/test/io.cpp
index ff900ab96b..ff900ab96b 100755..100644
--- a/indra/test/io.cpp
+++ b/indra/test/io.cpp
diff --git a/indra/test/llapp_tut.cpp b/indra/test/llapp_tut.cpp
index aa5c0672e6..aa5c0672e6 100755..100644
--- a/indra/test/llapp_tut.cpp
+++ b/indra/test/llapp_tut.cpp
diff --git a/indra/test/llassetuploadqueue_tut.cpp b/indra/test/llassetuploadqueue_tut.cpp
index 25efe63d3f..25efe63d3f 100755..100644
--- a/indra/test/llassetuploadqueue_tut.cpp
+++ b/indra/test/llassetuploadqueue_tut.cpp
diff --git a/indra/test/llblowfish_tut.cpp b/indra/test/llblowfish_tut.cpp
index 18eb01363f..18eb01363f 100755..100644
--- a/indra/test/llblowfish_tut.cpp
+++ b/indra/test/llblowfish_tut.cpp
diff --git a/indra/test/llbuffer_tut.cpp b/indra/test/llbuffer_tut.cpp
index 9b8aae6a73..9b8aae6a73 100755..100644
--- a/indra/test/llbuffer_tut.cpp
+++ b/indra/test/llbuffer_tut.cpp
diff --git a/indra/test/lldatapacker_tut.cpp b/indra/test/lldatapacker_tut.cpp
index b403660c13..b403660c13 100755..100644
--- a/indra/test/lldatapacker_tut.cpp
+++ b/indra/test/lldatapacker_tut.cpp
diff --git a/indra/test/lldoubledispatch_tut.cpp b/indra/test/lldoubledispatch_tut.cpp
index ad8f6454d4..ad8f6454d4 100755..100644
--- a/indra/test/lldoubledispatch_tut.cpp
+++ b/indra/test/lldoubledispatch_tut.cpp
diff --git a/indra/test/llevents_tut.cpp b/indra/test/llevents_tut.cpp
index 16edab6282..16edab6282 100755..100644
--- a/indra/test/llevents_tut.cpp
+++ b/indra/test/llevents_tut.cpp
diff --git a/indra/test/llhttpdate_tut.cpp b/indra/test/llhttpdate_tut.cpp
index ecf734ee90..ecf734ee90 100755..100644
--- a/indra/test/llhttpdate_tut.cpp
+++ b/indra/test/llhttpdate_tut.cpp
diff --git a/indra/test/llhttpnode_tut.cpp b/indra/test/llhttpnode_tut.cpp
index c528a34129..c528a34129 100755..100644
--- a/indra/test/llhttpnode_tut.cpp
+++ b/indra/test/llhttpnode_tut.cpp
diff --git a/indra/test/lliohttpserver_tut.cpp b/indra/test/lliohttpserver_tut.cpp
index 1513446788..1513446788 100755..100644
--- a/indra/test/lliohttpserver_tut.cpp
+++ b/indra/test/lliohttpserver_tut.cpp
diff --git a/indra/test/llmessageconfig_tut.cpp b/indra/test/llmessageconfig_tut.cpp
index df2151b1b1..df2151b1b1 100755..100644
--- a/indra/test/llmessageconfig_tut.cpp
+++ b/indra/test/llmessageconfig_tut.cpp
diff --git a/indra/test/llmessagetemplateparser_tut.cpp b/indra/test/llmessagetemplateparser_tut.cpp
index 39f834a9fc..39f834a9fc 100755..100644
--- a/indra/test/llmessagetemplateparser_tut.cpp
+++ b/indra/test/llmessagetemplateparser_tut.cpp
diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp
index fa4b085fd3..fa4b085fd3 100755..100644
--- a/indra/test/llpermissions_tut.cpp
+++ b/indra/test/llpermissions_tut.cpp
diff --git a/indra/test/llpipeutil.cpp b/indra/test/llpipeutil.cpp
index bb706b58d5..bb706b58d5 100755..100644
--- a/indra/test/llpipeutil.cpp
+++ b/indra/test/llpipeutil.cpp
diff --git a/indra/test/llpipeutil.h b/indra/test/llpipeutil.h
index 5deb26764f..5deb26764f 100755..100644
--- a/indra/test/llpipeutil.h
+++ b/indra/test/llpipeutil.h
diff --git a/indra/test/llsaleinfo_tut.cpp b/indra/test/llsaleinfo_tut.cpp
index 5f4d9186a8..5f4d9186a8 100755..100644
--- a/indra/test/llsaleinfo_tut.cpp
+++ b/indra/test/llsaleinfo_tut.cpp
diff --git a/indra/test/llscriptresource_tut.cpp b/indra/test/llscriptresource_tut.cpp
deleted file mode 100755
index 7a3b824e6d..0000000000
--- a/indra/test/llscriptresource_tut.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-/** 
- * @file llscriptresource_tut.cpp
- * @brief Test LLScriptResource
- *
- * $LicenseInfo:firstyear=2008&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 <tut/tut.h>
-#include "linden_common.h"
-
-#include "lltut.h"
-
-#include "llscriptresource.h"
-#include "llscriptresourceconsumer.h"
-#include "llscriptresourcepool.h"
-
-class TestConsumer : public LLScriptResourceConsumer
-{
-public:
-	TestConsumer()
-		: mUsedURLs(0)
-	{ }
-
-	// LLScriptResourceConsumer interface:
-	S32 getUsedPublicURLs() const
-	{
-		return mUsedURLs;
-	}
-
-	// Test details:
-	S32 mUsedURLs;
-};
-
-
-namespace tut
-{
-	class LLScriptResourceTestData
-	{
-	};
-	
-	typedef test_group<LLScriptResourceTestData> LLScriptResourceTestGroup;
-	typedef LLScriptResourceTestGroup::object		LLScriptResourceTestObject;
-	LLScriptResourceTestGroup scriptResourceTestGroup("scriptResource");
-
-	template<> template<>
-	void LLScriptResourceTestObject::test<1>()
-	{
-		LLScriptResource resource;
-		U32 total = 42;
-		
-		resource.setTotal(total);
-		ensure_equals("Verify set/get total", resource.getTotal(), total);
-		ensure_equals("Verify all resources are initially available",resource.getAvailable(),total);
-
-		// Requesting too many, releasing non-allocated
-		ensure("Request total + 1 resources should fail",!resource.request(total + 1));
-		ensure_equals("Verify all resources available after failed request",resource.getAvailable(),total);
-
-		ensure("Releasing resources when none allocated should fail",!resource.release());
-		ensure_equals("All resources should be available after failed release",resource.getAvailable(),total);
-
-		ensure("Request one resource", resource.request());
-		ensure_equals("Verify available resources after successful request",resource.getAvailable(),total - 1);
-
-		// Is this right?  Or should we release all used resources if we try to release more than are currently used?
-		ensure("Release more resources than allocated",!resource.release(2));
-		ensure_equals("Verify resource availability after failed release",resource.getAvailable(),total - 1);
-
-		ensure("Release a resource",resource.release());
-		ensure_equals("Verify all resources available after successful release",resource.getAvailable(),total);
-	}
-
-
-	template<> template<>
-	void LLScriptResourceTestObject::test<2>()
-	{
-		LLScriptResource resource;
-		U32 total = 42;
-
-		resource.setTotal(total);
-
-		S32 resources_to_request = 30;
-		ensure("Get multiple resources resources",resource.request(resources_to_request));
-		ensure_equals("Verify available resources is correct after request of multiple resources",resource.getAvailable(), total - resources_to_request);
-
-		S32 resources_to_release = (resources_to_request / 2);
-		ensure("Release some resources",resource.release(resources_to_release));
-
-		S32 expected_available = (total - resources_to_request + resources_to_release);
-		ensure_equals("Verify available resources after release of some resources",resource.getAvailable(), expected_available);
-
-		resources_to_release = (resources_to_request - resources_to_release);
-		ensure("Release remaining resources",resource.release(resources_to_release));
-
-		ensure_equals("Verify available resources after release of remaining resources",resource.getAvailable(), total);
-	}
-
-	template<> template<>
-	void LLScriptResourceTestObject::test<3>()
-	{
-		LLScriptResource resource;
-
-		U32 total = 42;
-		resource.setTotal(total);
-
-		ensure("Request all resources",resource.request(total));
-
-		U32 low_total = 10;
-		ensure("Release all resources",resource.release(total));
-		ensure_equals("Verify all resources available after releasing",resource.getAvailable(),total);
-
-		resource.setTotal(low_total);
-		ensure_equals("Verify low total resources are available after set",resource.getAvailable(),low_total);
-	}
-	
-
-	template<> template<>
-	void LLScriptResourceTestObject::test<4>()
-	{
-		S32 big_resource_total = 100;
-		S32 small_resource_total = 10;
-		LLScriptResourcePool big_pool;
-		big_pool.getPublicURLResource().setTotal(big_resource_total);
-		LLScriptResourcePool small_pool;
-		small_pool.getPublicURLResource().setTotal(small_resource_total);
-
-		TestConsumer consumer;
-		LLScriptResourcePool& initial_pool = consumer.getScriptResourcePool();
-		ensure("Initial resource pool is 'null'.", (&initial_pool == &LLScriptResourcePool::null));
-
-		consumer.switchScriptResourcePools(big_pool);
-		LLScriptResourcePool& get_pool = consumer.getScriptResourcePool();
-		ensure("Get resource that was set.", (&big_pool == &get_pool));
-
-		ensure_equals("No public urls in use yet.", consumer.getUsedPublicURLs(),0);
-
-		S32 request_urls = 5;
-		consumer.mUsedURLs = request_urls;
-		consumer.getScriptResourcePool().getPublicURLResource().request(request_urls);
-
-		ensure_equals("Available urls on big_pool is 5 less than total.",
-			big_pool.getPublicURLResource().getAvailable(), big_resource_total - request_urls);
-
-		ensure("Switching from big pool to small pool",
-			   consumer.switchScriptResourcePools(small_pool));
-
-		ensure_equals("All resources available to big pool again",
-			big_pool.getPublicURLResource().getAvailable(), big_resource_total);
-
-		ensure_equals("Available urls on small pool is 5 less than total.",
-			small_pool.getPublicURLResource().getAvailable(), small_resource_total - request_urls);
-
-		ensure("Switching from small pool to big pool",
-			   consumer.switchScriptResourcePools(big_pool));
-
-		consumer.getScriptResourcePool().getPublicURLResource().release(request_urls);
-
-		request_urls = 50; // Too many for the small_pool
-
-		consumer.mUsedURLs = request_urls;
-		consumer.getScriptResourcePool().getPublicURLResource().request(request_urls);
-
-		// Verify big pool has them
-		ensure_equals("Available urls on big pool is 50 less than total.",
-			big_pool.getPublicURLResource().getAvailable(), big_resource_total - request_urls);
-
-		// Verify can't switch to small_pool
-		ensure("Switching to small pool with too many resources",
-			   !consumer.switchScriptResourcePools(small_pool));
-
-		// Verify big pool still accounting for used resources
-		ensure_equals("Available urls on big_pool is still 50 less than total.",
-			big_pool.getPublicURLResource().getAvailable(), big_resource_total - request_urls);
-		
-		// Verify small pool still has all resources available.
-		ensure_equals("All resources in small pool are still available.",
-			small_pool.getPublicURLResource().getAvailable(), small_resource_total);
-	}
-}
diff --git a/indra/test/llsd_new_tut.cpp b/indra/test/llsd_new_tut.cpp
index 458df3361e..458df3361e 100755..100644
--- a/indra/test/llsd_new_tut.cpp
+++ b/indra/test/llsd_new_tut.cpp
diff --git a/indra/test/llsdmessagebuilder_tut.cpp b/indra/test/llsdmessagebuilder_tut.cpp
index b7283f53a6..b7283f53a6 100755..100644
--- a/indra/test/llsdmessagebuilder_tut.cpp
+++ b/indra/test/llsdmessagebuilder_tut.cpp
diff --git a/indra/test/llsdmessagereader_tut.cpp b/indra/test/llsdmessagereader_tut.cpp
index 6dc5cf593e..6dc5cf593e 100755..100644
--- a/indra/test/llsdmessagereader_tut.cpp
+++ b/indra/test/llsdmessagereader_tut.cpp
diff --git a/indra/test/llsdtraits.h b/indra/test/llsdtraits.h
index 07f6193ce2..07f6193ce2 100755..100644
--- a/indra/test/llsdtraits.h
+++ b/indra/test/llsdtraits.h
diff --git a/indra/test/llsdutil_tut.cpp b/indra/test/llsdutil_tut.cpp
index 140f4b832b..140f4b832b 100755..100644
--- a/indra/test/llsdutil_tut.cpp
+++ b/indra/test/llsdutil_tut.cpp
diff --git a/indra/test/llservicebuilder_tut.cpp b/indra/test/llservicebuilder_tut.cpp
index 8f5be3011c..8f5be3011c 100755..100644
--- a/indra/test/llservicebuilder_tut.cpp
+++ b/indra/test/llservicebuilder_tut.cpp
diff --git a/indra/test/llstreamtools_tut.cpp b/indra/test/llstreamtools_tut.cpp
index 0f6436f0f4..0f6436f0f4 100755..100644
--- a/indra/test/llstreamtools_tut.cpp
+++ b/indra/test/llstreamtools_tut.cpp
diff --git a/indra/test/lltemplatemessagebuilder_tut.cpp b/indra/test/lltemplatemessagebuilder_tut.cpp
index 7b4b6a8b70..7b4b6a8b70 100755..100644
--- a/indra/test/lltemplatemessagebuilder_tut.cpp
+++ b/indra/test/lltemplatemessagebuilder_tut.cpp
diff --git a/indra/test/lltimestampcache_tut.cpp b/indra/test/lltimestampcache_tut.cpp
index 857a17a6d5..857a17a6d5 100755..100644
--- a/indra/test/lltimestampcache_tut.cpp
+++ b/indra/test/lltimestampcache_tut.cpp
diff --git a/indra/test/lltranscode_tut.cpp b/indra/test/lltranscode_tut.cpp
index 3fce6e0e2b..3fce6e0e2b 100755..100644
--- a/indra/test/lltranscode_tut.cpp
+++ b/indra/test/lltranscode_tut.cpp
diff --git a/indra/test/lltut.cpp b/indra/test/lltut.cpp
index 5a8ee87afd..5a8ee87afd 100755..100644
--- a/indra/test/lltut.cpp
+++ b/indra/test/lltut.cpp
diff --git a/indra/test/lltut.h b/indra/test/lltut.h
index 9835565bb6..9835565bb6 100755..100644
--- a/indra/test/lltut.h
+++ b/indra/test/lltut.h
diff --git a/indra/test/lluserrelations_tut.cpp b/indra/test/lluserrelations_tut.cpp
index afbcf6e5a8..afbcf6e5a8 100755..100644
--- a/indra/test/lluserrelations_tut.cpp
+++ b/indra/test/lluserrelations_tut.cpp
diff --git a/indra/test/llxorcipher_tut.cpp b/indra/test/llxorcipher_tut.cpp
index 55b3faaa61..55b3faaa61 100755..100644
--- a/indra/test/llxorcipher_tut.cpp
+++ b/indra/test/llxorcipher_tut.cpp
diff --git a/indra/test/message_tut.cpp b/indra/test/message_tut.cpp
index 8718360f0c..8718360f0c 100755..100644
--- a/indra/test/message_tut.cpp
+++ b/indra/test/message_tut.cpp
diff --git a/indra/test/mock_http_client.cpp b/indra/test/mock_http_client.cpp
index e72902bfc2..e72902bfc2 100755..100644
--- a/indra/test/mock_http_client.cpp
+++ b/indra/test/mock_http_client.cpp
diff --git a/indra/test/mock_http_client.h b/indra/test/mock_http_client.h
index a2b9b435fb..a2b9b435fb 100755..100644
--- a/indra/test/mock_http_client.h
+++ b/indra/test/mock_http_client.h
diff --git a/indra/test/namedtempfile.h b/indra/test/namedtempfile.h
index 7d59cad32c..7d59cad32c 100755..100644
--- a/indra/test/namedtempfile.h
+++ b/indra/test/namedtempfile.h
diff --git a/indra/test/prim_linkability_tut.cpp b/indra/test/prim_linkability_tut.cpp
index a70912e535..a70912e535 100755..100644
--- a/indra/test/prim_linkability_tut.cpp
+++ b/indra/test/prim_linkability_tut.cpp
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index e42374d56b..e42374d56b 100755..100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
diff --git a/indra/test/test.h b/indra/test/test.h
index 40c94283ec..40c94283ec 100755..100644
--- a/indra/test/test.h
+++ b/indra/test/test.h