Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
author: Melanie 2012-11-25 14:13:50 +0000
committer: Melanie 2012-11-25 14:13:50 +0000
commit: fd7a83f439132062d500471830eb26e7183d30bc (patch)
tree: db581710c1a370ee4f5ac7a3b2f0dfc9bcbd5457 /OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs
parent: Merge branch 'careminster' into avination (diff)
parent: Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
download: opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.zip
opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.gz
opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.bz2
opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs b/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs
index 09b6f6d..142726b 100644
--- a/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs
+++ b/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs
@@ -37,7 +37,7 @@ using OpenSim.Tests.Common;
 namespace OpenSim.Framework.Serialization.Tests
 {
    [TestFixture]
-    public class RegionSettingsSerializerTests
+    public class RegionSettingsSerializerTests : OpenSimTestCase
    {
        private string m_serializedRs = @"<?xml version=""1.0"" encoding=""utf-16""?>
 <RegionSettings>
author	Melanie	2012-11-25 14:13:50 +0000
committer	Melanie	2012-11-25 14:13:50 +0000
commit	fd7a83f439132062d500471830eb26e7183d30bc (patch)
tree	db581710c1a370ee4f5ac7a3b2f0dfc9bcbd5457 /OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs
parent	Merge branch 'careminster' into avination (diff)
parent	Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
download	opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.zip opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.gz opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.bz2 opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.xz

diff --git a/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs b/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs index 09b6f6d..142726b 100644 --- a/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs +++ b/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs
@@ -37,7 +37,7 @@ using OpenSim.Tests.Common;
37	namespace OpenSim.Framework.Serialization.Tests	37	namespace OpenSim.Framework.Serialization.Tests
38	{	38	{
39	[TestFixture]	39	[TestFixture]
40	public class RegionSettingsSerializerTests	40	public class RegionSettingsSerializerTests : OpenSimTestCase
41	{	41	{
42	private string m_serializedRs = @"<?xml version=""1.0"" encoding=""utf-16""?>	42	private string m_serializedRs = @"<?xml version=""1.0"" encoding=""utf-16""?>
43	<RegionSettings>	43	<RegionSettings>