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/Framework/Scenes/Tests/TaskInventoryTests.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, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
index 55c80f5..d15141b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Tests
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
            
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
            UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
            SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
            SceneObjectPart sop1 = sog1.RootPart;
@@ -81,7 +81,7 @@ namespace OpenSim.Region.Framework.Tests
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
            
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
            UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
            SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
            SceneObjectPart sop1 = sog1.RootPart;
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Framework.Tests
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
            
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
            UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
            SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
            SceneObjectPart sop1 = sog1.RootPart;
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Framework.Tests
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
            
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
            UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
            SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
            SceneObjectPart sop1 = sog1.RootPart;
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/Framework/Scenes/Tests/TaskInventoryTests.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/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs index 55c80f5..d15141b 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Tests
58	TestHelpers.InMethod();	58	TestHelpers.InMethod();
59	// log4net.Config.XmlConfigurator.Configure();	59	// log4net.Config.XmlConfigurator.Configure();
60		60
61	Scene scene = SceneHelpers.SetupScene();	61	Scene scene = new SceneHelpers().SetupScene();
62	UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);	62	UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
63	SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);	63	SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
64	SceneObjectPart sop1 = sog1.RootPart;	64	SceneObjectPart sop1 = sog1.RootPart;
@@ -81,7 +81,7 @@ namespace OpenSim.Region.Framework.Tests
81	TestHelpers.InMethod();	81	TestHelpers.InMethod();
82	// log4net.Config.XmlConfigurator.Configure();	82	// log4net.Config.XmlConfigurator.Configure();
83		83
84	Scene scene = SceneHelpers.SetupScene();	84	Scene scene = new SceneHelpers().SetupScene();
85	UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);	85	UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
86	SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);	86	SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
87	SceneObjectPart sop1 = sog1.RootPart;	87	SceneObjectPart sop1 = sog1.RootPart;
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Framework.Tests
124	TestHelpers.InMethod();	124	TestHelpers.InMethod();
125	// log4net.Config.XmlConfigurator.Configure();	125	// log4net.Config.XmlConfigurator.Configure();
126		126
127	Scene scene = SceneHelpers.SetupScene();	127	Scene scene = new SceneHelpers().SetupScene();
128	UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);	128	UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
129	SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);	129	SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
130	SceneObjectPart sop1 = sog1.RootPart;	130	SceneObjectPart sop1 = sog1.RootPart;
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Framework.Tests
153	TestHelpers.InMethod();	153	TestHelpers.InMethod();
154	// log4net.Config.XmlConfigurator.Configure();	154	// log4net.Config.XmlConfigurator.Configure();
155		155
156	Scene scene = SceneHelpers.SetupScene();	156	Scene scene = new SceneHelpers().SetupScene();
157	UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);	157	UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
158	SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);	158	SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
159	SceneObjectPart sop1 = sog1.RootPart;	159	SceneObjectPart sop1 = sog1.RootPart;