From 37fa6775488ab237a4537d49b92a8d52b0497b98 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 21 Jan 2009 21:14:17 +0000 Subject: * refactor: Extract caps related code from scene and put into a region module * No functional changes in this revision --- OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs | 7 +++++++ OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/Tests') diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs index 5fa897c..dee3914 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs +++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs @@ -34,6 +34,8 @@ using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; using OpenSim.Region.Physics.Manager; using OpenSim.Region.Environment; +using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Environment.Modules.Agent.Capabilities; using OpenSim.Region.Environment.Scenes; using OpenSim.Tests.Common.Mock; @@ -79,6 +81,11 @@ namespace OpenSim.Region.Environment.Scenes.Tests TestScene testScene = new TestScene( regInfo, acm, cm, scs, ac, sm, null, false, false, false, configSource, null); + + IRegionModule capsModule = new CapabilitiesModule(); + capsModule.Initialise(testScene, new IniConfigSource()); + testScene.AddModule(capsModule.Name, capsModule); + testScene.SetModuleInterfaces(); testScene.LandChannel = new TestLandChannel(); testScene.LoadWorldMap(); diff --git a/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs index d7342de..a61b9c2 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs +++ b/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs @@ -63,13 +63,13 @@ namespace OpenSim.Region.Environment.Scenes.Tests // TODO: Clean this up Scene sceneA = SceneTestUtils.SetupScene("sceneA", sceneAId, 1000, 1000, cm); interregionComms.Initialise(sceneA, new IniConfigSource()); - sceneA.AddModule(interregionComms.Name, interregionComms); + sceneA.AddModule(interregionComms.Name, interregionComms); sceneA.SetModuleInterfaces(); sceneA.RegisterRegionWithGrid(); // TODO: Clean this up Scene sceneB = SceneTestUtils.SetupScene("sceneB", sceneBId, 1010, 1010, cm); - interregionComms.Initialise(sceneB, new IniConfigSource()); + interregionComms.Initialise(sceneB, new IniConfigSource()); sceneB.AddModule(interregionComms.Name, interregionComms); sceneB.SetModuleInterfaces(); sceneB.RegisterRegionWithGrid(); -- cgit v1.1