diff options
author | Justin Clarke Casey | 2009-01-21 21:14:17 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-01-21 21:14:17 +0000 |
commit | 37fa6775488ab237a4537d49b92a8d52b0497b98 (patch) | |
tree | 805183f2f807a8a051ba64878c079fb0a8c7fe17 /OpenSim/Region/Environment/Scenes/Tests | |
parent | * Restore commented out isdone assertions in TextureSendTests.T010_SendPkg() (diff) | |
download | opensim-SC_OLD-37fa6775488ab237a4537d49b92a8d52b0497b98.zip opensim-SC_OLD-37fa6775488ab237a4537d49b92a8d52b0497b98.tar.gz opensim-SC_OLD-37fa6775488ab237a4537d49b92a8d52b0497b98.tar.bz2 opensim-SC_OLD-37fa6775488ab237a4537d49b92a8d52b0497b98.tar.xz |
* refactor: Extract caps related code from scene and put into a region module
* No functional changes in this revision
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Tests')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs | 4 |
2 files changed, 9 insertions, 2 deletions
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; | |||
34 | using OpenSim.Framework.Servers; | 34 | using OpenSim.Framework.Servers; |
35 | using OpenSim.Region.Physics.Manager; | 35 | using OpenSim.Region.Physics.Manager; |
36 | using OpenSim.Region.Environment; | 36 | using OpenSim.Region.Environment; |
37 | using OpenSim.Region.Environment.Interfaces; | ||
38 | using OpenSim.Region.Environment.Modules.Agent.Capabilities; | ||
37 | using OpenSim.Region.Environment.Scenes; | 39 | using OpenSim.Region.Environment.Scenes; |
38 | using OpenSim.Tests.Common.Mock; | 40 | using OpenSim.Tests.Common.Mock; |
39 | 41 | ||
@@ -79,6 +81,11 @@ namespace OpenSim.Region.Environment.Scenes.Tests | |||
79 | 81 | ||
80 | TestScene testScene = new TestScene( | 82 | TestScene testScene = new TestScene( |
81 | regInfo, acm, cm, scs, ac, sm, null, false, false, false, configSource, null); | 83 | regInfo, acm, cm, scs, ac, sm, null, false, false, false, configSource, null); |
84 | |||
85 | IRegionModule capsModule = new CapabilitiesModule(); | ||
86 | capsModule.Initialise(testScene, new IniConfigSource()); | ||
87 | testScene.AddModule(capsModule.Name, capsModule); | ||
88 | testScene.SetModuleInterfaces(); | ||
82 | 89 | ||
83 | testScene.LandChannel = new TestLandChannel(); | 90 | testScene.LandChannel = new TestLandChannel(); |
84 | testScene.LoadWorldMap(); | 91 | 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 | |||
63 | // TODO: Clean this up | 63 | // TODO: Clean this up |
64 | Scene sceneA = SceneTestUtils.SetupScene("sceneA", sceneAId, 1000, 1000, cm); | 64 | Scene sceneA = SceneTestUtils.SetupScene("sceneA", sceneAId, 1000, 1000, cm); |
65 | interregionComms.Initialise(sceneA, new IniConfigSource()); | 65 | interregionComms.Initialise(sceneA, new IniConfigSource()); |
66 | sceneA.AddModule(interregionComms.Name, interregionComms); | 66 | sceneA.AddModule(interregionComms.Name, interregionComms); |
67 | sceneA.SetModuleInterfaces(); | 67 | sceneA.SetModuleInterfaces(); |
68 | sceneA.RegisterRegionWithGrid(); | 68 | sceneA.RegisterRegionWithGrid(); |
69 | 69 | ||
70 | // TODO: Clean this up | 70 | // TODO: Clean this up |
71 | Scene sceneB = SceneTestUtils.SetupScene("sceneB", sceneBId, 1010, 1010, cm); | 71 | Scene sceneB = SceneTestUtils.SetupScene("sceneB", sceneBId, 1010, 1010, cm); |
72 | interregionComms.Initialise(sceneB, new IniConfigSource()); | 72 | interregionComms.Initialise(sceneB, new IniConfigSource()); |
73 | sceneB.AddModule(interregionComms.Name, interregionComms); | 73 | sceneB.AddModule(interregionComms.Name, interregionComms); |
74 | sceneB.SetModuleInterfaces(); | 74 | sceneB.SetModuleInterfaces(); |
75 | sceneB.RegisterRegionWithGrid(); | 75 | sceneB.RegisterRegionWithGrid(); |