Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2012-04-27 09:26:14 -0700
committer: Diva Canto 2012-04-27 09:26:14 -0700
commit: 2970a18e54bc4811af67a2f0c307fb79c00c9a18 (patch)
tree: e4faab8dd2b55edff0632faf241c960ad553ccbc /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
parent: Minor change in error message (HG teleport failures) (diff)
parent: Add regression test for teleporting an agent between separated regions on the... (diff)
download: opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.zip
opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.gz
opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.bz2
opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
index d2f6327..ac638f1 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
            
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
            IConfigSource configSource = new IniConfigSource();
            IConfig config = configSource.AddConfig("Groups");            
            config.Set("Enabled", true);
author	Diva Canto	2012-04-27 09:26:14 -0700
committer	Diva Canto	2012-04-27 09:26:14 -0700
commit	2970a18e54bc4811af67a2f0c307fb79c00c9a18 (patch)
tree	e4faab8dd2b55edff0632faf241c960ad553ccbc /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
parent	Minor change in error message (HG teleport failures) (diff)
parent	Add regression test for teleporting an agent between separated regions on the... (diff)
download	opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.zip opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.gz opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.bz2 opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs index d2f6327..ac638f1 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
50	TestHelpers.InMethod();	50	TestHelpers.InMethod();
51	// log4net.Config.XmlConfigurator.Configure();	51	// log4net.Config.XmlConfigurator.Configure();
52		52
53	TestScene scene = SceneHelpers.SetupScene();	53	TestScene scene = new SceneHelpers().SetupScene();
54	IConfigSource configSource = new IniConfigSource();	54	IConfigSource configSource = new IniConfigSource();
55	IConfig config = configSource.AddConfig("Groups");	55	IConfig config = configSource.AddConfig("Groups");
56	config.Set("Enabled", true);	56	config.Set("Enabled", true);