diff options
author | Dr Scofield | 2009-05-25 11:11:04 +0000 |
---|---|---|
committer | Dr Scofield | 2009-05-25 11:11:04 +0000 |
commit | d4d9d8ed8feb2532ca66319e5e7eb500ba188609 (patch) | |
tree | 569bc0093a66ad39dadf945b54e3a117b944e31c | |
parent | letting TestClient implement IClientCore as well to fix test case (diff) | |
download | opensim-SC-d4d9d8ed8feb2532ca66319e5e7eb500ba188609.zip opensim-SC-d4d9d8ed8feb2532ca66319e5e7eb500ba188609.tar.gz opensim-SC-d4d9d8ed8feb2532ca66319e5e7eb500ba188609.tar.bz2 opensim-SC-d4d9d8ed8feb2532ca66319e5e7eb500ba188609.tar.xz |
converting CapabilitiesModule to new region module scheme
3 files changed, 27 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs index dbd5104..eba077e 100644 --- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs | |||
@@ -38,7 +38,7 @@ using Caps=OpenSim.Framework.Communications.Capabilities.Caps; | |||
38 | 38 | ||
39 | namespace OpenSim.Region.CoreModules.Agent.Capabilities | 39 | namespace OpenSim.Region.CoreModules.Agent.Capabilities |
40 | { | 40 | { |
41 | public class CapabilitiesModule : IRegionModule, ICapabilitiesModule | 41 | public class CapabilitiesModule : INonSharedRegionModule, ICapabilitiesModule |
42 | { | 42 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 44 | ||
@@ -53,16 +53,33 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities | |||
53 | protected Dictionary<UUID, Dictionary<ulong, string>> childrenSeeds | 53 | protected Dictionary<UUID, Dictionary<ulong, string>> childrenSeeds |
54 | = new Dictionary<UUID, Dictionary<ulong, string>>(); | 54 | = new Dictionary<UUID, Dictionary<ulong, string>>(); |
55 | 55 | ||
56 | public void Initialise(Scene scene, IConfigSource source) | 56 | public void Initialise(IConfigSource source) |
57 | { | ||
58 | } | ||
59 | |||
60 | public void AddRegion(Scene scene) | ||
57 | { | 61 | { |
58 | m_scene = scene; | 62 | m_scene = scene; |
59 | m_scene.RegisterModuleInterface<ICapabilitiesModule>(this); | 63 | m_scene.RegisterModuleInterface<ICapabilitiesModule>(this); |
60 | } | 64 | } |
65 | |||
66 | public void RegionLoaded(Scene scene) | ||
67 | { | ||
68 | } | ||
69 | |||
70 | public void RemoveRegion(Scene scene) | ||
71 | { | ||
72 | m_scene.UnregisterModuleInterface<ICapabilitiesModule>(this); | ||
73 | } | ||
61 | 74 | ||
62 | public void PostInitialise() {} | 75 | public void PostInitialise() {} |
76 | |||
63 | public void Close() {} | 77 | public void Close() {} |
64 | public string Name { get { return "Capabilities Module"; } } | 78 | |
65 | public bool IsSharedModule { get { return false; } } | 79 | public string Name |
80 | { | ||
81 | get { return "Capabilities Module"; } | ||
82 | } | ||
66 | 83 | ||
67 | public void AddCapsHandler(UUID agentId) | 84 | public void AddCapsHandler(UUID agentId) |
68 | { | 85 | { |
@@ -86,7 +103,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities | |||
86 | 103 | ||
87 | Caps caps | 104 | Caps caps |
88 | = new Caps( | 105 | = new Caps( |
89 | m_scene.AssetService, m_scene.CommsManager.HttpServer, m_scene.RegionInfo.ExternalHostName, | 106 | m_scene.AssetService, m_scene.CommsManager.HttpServer, m_scene.RegionInfo.ExternalHostName, |
90 | m_scene.CommsManager.HttpServer.Port, | 107 | m_scene.CommsManager.HttpServer.Port, |
91 | capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName); | 108 | capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName); |
92 | 109 | ||
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index 6c80598..b71b7ee 100644 --- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml +++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml | |||
@@ -8,6 +8,7 @@ | |||
8 | </Dependencies> | 8 | </Dependencies> |
9 | 9 | ||
10 | <Extension path = "/OpenSim/RegionModules"> | 10 | <Extension path = "/OpenSim/RegionModules"> |
11 | <RegionModule id="CapabilitiesModule" type="OpenSim.Region.CoreModules.Agent.Capability.CapabilitiesModule" /> | ||
11 | <RegionModule id="TerrainModule" type="OpenSim.Region.CoreModules.World.Terrain.TerrainModule" /> | 12 | <RegionModule id="TerrainModule" type="OpenSim.Region.CoreModules.World.Terrain.TerrainModule" /> |
12 | <RegionModule id="WorldMapModule" type="OpenSim.Region.CoreModules.World.WorldMap.WorldMapModule" /> | 13 | <RegionModule id="WorldMapModule" type="OpenSim.Region.CoreModules.World.WorldMap.WorldMapModule" /> |
13 | <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" /> | 14 | <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" /> |
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 413a2b9..6de5a02 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
@@ -117,9 +117,10 @@ namespace OpenSim.Tests.Common.Setup | |||
117 | TestScene testScene = new TestScene( | 117 | TestScene testScene = new TestScene( |
118 | regInfo, acm, cm, scs, sm, null, false, false, false, configSource, null); | 118 | regInfo, acm, cm, scs, sm, null, false, false, false, configSource, null); |
119 | 119 | ||
120 | IRegionModule capsModule = new CapabilitiesModule(); | 120 | INonSharedRegionModule capsModule = new CapabilitiesModule(); |
121 | capsModule.Initialise(testScene, new IniConfigSource()); | 121 | capsModule.Initialise(new IniConfigSource()); |
122 | testScene.AddModule(capsModule.Name, capsModule); | 122 | testScene.AddRegionModule(capsModule.Name, capsModule); |
123 | capsModule.AddRegion(testScene); | ||
123 | 124 | ||
124 | IRegionModule godsModule = new GodsModule(); | 125 | IRegionModule godsModule = new GodsModule(); |
125 | godsModule.Initialise(testScene, new IniConfigSource()); | 126 | godsModule.Initialise(testScene, new IniConfigSource()); |