Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
author: Melanie 2012-04-27 17:09:49 +0100
committer: Melanie 2012-04-27 17:09:49 +0100
commit: 90305001de2dc043fa76760367ac22de0056686a (patch)
tree: ad8d39d2064d4a6b07d03b55d6cfd0dbe3d3d8f5 /OpenSim/Region/CoreModules/Avatar/AvatarFactory
parent: Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parent: Add regression test for teleporting an agent between separated regions on the... (diff)
download: opensim-SC_OLD-90305001de2dc043fa76760367ac22de0056686a.zip
opensim-SC_OLD-90305001de2dc043fa76760367ac22de0056686a.tar.gz
opensim-SC_OLD-90305001de2dc043fa76760367ac22de0056686a.tar.bz2
opensim-SC_OLD-90305001de2dc043fa76760367ac22de0056686a.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
index 11a0a86..848b3bf 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
            UUID userId = TestHelpers.ParseTail(0x1);
            AvatarFactoryModule afm = new AvatarFactoryModule();
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
            SceneHelpers.SetupSceneModules(scene, afm);
            ScenePresence sp = SceneHelpers.AddScenePresence(scene, userId);
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
            CoreAssetCache assetCache = new CoreAssetCache();
            
            AvatarFactoryModule afm = new AvatarFactoryModule();
-            TestScene scene = SceneHelpers.SetupScene(assetCache);
+            TestScene scene = new SceneHelpers(assetCache).SetupScene();
            SceneHelpers.SetupSceneModules(scene, afm);
            ScenePresence sp = SceneHelpers.AddScenePresence(scene, userId);
author	Melanie	2012-04-27 17:09:49 +0100
committer	Melanie	2012-04-27 17:09:49 +0100
commit	90305001de2dc043fa76760367ac22de0056686a (patch)
tree	ad8d39d2064d4a6b07d03b55d6cfd0dbe3d3d8f5 /OpenSim/Region/CoreModules/Avatar/AvatarFactory
parent	Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parent	Add regression test for teleporting an agent between separated regions on the... (diff)
download	opensim-SC_OLD-90305001de2dc043fa76760367ac22de0056686a.zip opensim-SC_OLD-90305001de2dc043fa76760367ac22de0056686a.tar.gz opensim-SC_OLD-90305001de2dc043fa76760367ac22de0056686a.tar.bz2 opensim-SC_OLD-90305001de2dc043fa76760367ac22de0056686a.tar.xz

diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs index 11a0a86..848b3bf 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
53	UUID userId = TestHelpers.ParseTail(0x1);	53	UUID userId = TestHelpers.ParseTail(0x1);
54		54
55	AvatarFactoryModule afm = new AvatarFactoryModule();	55	AvatarFactoryModule afm = new AvatarFactoryModule();
56	TestScene scene = SceneHelpers.SetupScene();	56	TestScene scene = new SceneHelpers().SetupScene();
57	SceneHelpers.SetupSceneModules(scene, afm);	57	SceneHelpers.SetupSceneModules(scene, afm);
58	ScenePresence sp = SceneHelpers.AddScenePresence(scene, userId);	58	ScenePresence sp = SceneHelpers.AddScenePresence(scene, userId);
59		59
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
81	CoreAssetCache assetCache = new CoreAssetCache();	81	CoreAssetCache assetCache = new CoreAssetCache();
82		82
83	AvatarFactoryModule afm = new AvatarFactoryModule();	83	AvatarFactoryModule afm = new AvatarFactoryModule();
84	TestScene scene = SceneHelpers.SetupScene(assetCache);	84	TestScene scene = new SceneHelpers(assetCache).SetupScene();
85	SceneHelpers.SetupSceneModules(scene, afm);	85	SceneHelpers.SetupSceneModules(scene, afm);
86	ScenePresence sp = SceneHelpers.AddScenePresence(scene, userId);	86	ScenePresence sp = SceneHelpers.AddScenePresence(scene, userId);
87		87