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/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.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/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index bfe5e4a..42d07fd 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
            config.AddConfig("Modules");
            config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule");
-            scene = SceneHelpers.SetupScene();
+            scene = new SceneHelpers().SetupScene();
            m_attMod = new AttachmentsModule();
            SceneHelpers.SetupSceneModules(scene, config, m_attMod, new BasicInventoryAccessModule());
        }
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/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.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/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index bfe5e4a..42d07fd 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
72	config.AddConfig("Modules");	72	config.AddConfig("Modules");
73	config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule");	73	config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule");
74		74
75	scene = SceneHelpers.SetupScene();	75	scene = new SceneHelpers().SetupScene();
76	m_attMod = new AttachmentsModule();	76	m_attMod = new AttachmentsModule();
77	SceneHelpers.SetupSceneModules(scene, config, m_attMod, new BasicInventoryAccessModule());	77	SceneHelpers.SetupSceneModules(scene, config, m_attMod, new BasicInventoryAccessModule());
78	}	78	}