diff options
author | Justin Clarke Casey | 2009-01-06 15:09:52 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-01-06 15:09:52 +0000 |
commit | b6ee2f15bacda2a2c22785923b1e41639db5a6db (patch) | |
tree | 5608581d1cd1b2f37c149d60e79d81da9cc705ca | |
parent | * refactor: call AddHttpHandler() directly via CommsManager (diff) | |
download | opensim-SC-b6ee2f15bacda2a2c22785923b1e41639db5a6db.zip opensim-SC-b6ee2f15bacda2a2c22785923b1e41639db5a6db.tar.gz opensim-SC-b6ee2f15bacda2a2c22785923b1e41639db5a6db.tar.bz2 opensim-SC-b6ee2f15bacda2a2c22785923b1e41639db5a6db.tar.xz |
* refactor: Remove the need to separately pass in the http listener to the scene - this is always available via CommsManager
-rw-r--r-- | OpenSim/Region/Application/HGOpenSimNode.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs | 3 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | 4 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestScene.cs | 4 |
7 files changed, 23 insertions, 23 deletions
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs index 4f355cf..6c2db82 100644 --- a/OpenSim/Region/Application/HGOpenSimNode.cs +++ b/OpenSim/Region/Application/HGOpenSimNode.cs | |||
@@ -129,11 +129,12 @@ namespace OpenSim | |||
129 | AgentCircuitManager circuitManager) | 129 | AgentCircuitManager circuitManager) |
130 | { | 130 | { |
131 | HGSceneCommunicationService sceneGridService = new HGSceneCommunicationService(m_commsManager, HGServices); | 131 | HGSceneCommunicationService sceneGridService = new HGSceneCommunicationService(m_commsManager, HGServices); |
132 | |||
132 | return | 133 | return |
133 | new HGScene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, | 134 | new HGScene( |
134 | storageManager, m_httpServer, | 135 | regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, storageManager, |
135 | m_moduleLoader, m_configSettings.DumpAssetsToFile, m_configSettings.PhysicalPrim, m_configSettings.See_into_region_from_neighbor, m_config.Source, | 136 | m_moduleLoader, m_configSettings.DumpAssetsToFile, m_configSettings.PhysicalPrim, |
136 | m_version); | 137 | m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); |
137 | } | 138 | } |
138 | 139 | ||
139 | public override void RunCmd(string command, string[] cmdparams) | 140 | public override void RunCmd(string command, string[] cmdparams) |
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 9031a8b..e3a81d1 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -467,11 +467,11 @@ namespace OpenSim | |||
467 | AgentCircuitManager circuitManager) | 467 | AgentCircuitManager circuitManager) |
468 | { | 468 | { |
469 | SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); | 469 | SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); |
470 | return | 470 | |
471 | new Scene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, | 471 | return new Scene( |
472 | storageManager, m_httpServer, | 472 | regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, |
473 | m_moduleLoader, m_configSettings.DumpAssetsToFile, m_configSettings.PhysicalPrim, m_configSettings.See_into_region_from_neighbor, m_config.Source, | 473 | storageManager, m_moduleLoader, m_configSettings.DumpAssetsToFile, m_configSettings.PhysicalPrim, |
474 | m_version); | 474 | m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); |
475 | } | 475 | } |
476 | 476 | ||
477 | public void handleRestartRegion(RegionInfo whichRegion) | 477 | public void handleRestartRegion(RegionInfo whichRegion) |
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs index f44ba30..bdb90d8 100644 --- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs | |||
@@ -58,10 +58,10 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid | |||
58 | 58 | ||
59 | public HGScene(RegionInfo regInfo, AgentCircuitManager authen, | 59 | public HGScene(RegionInfo regInfo, AgentCircuitManager authen, |
60 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, | 60 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, |
61 | AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, | 61 | AssetCache assetCach, StorageManager storeManager, |
62 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, | 62 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, |
63 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | 63 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) |
64 | : base(regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, httpServer, moduleLoader, | 64 | : base(regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, moduleLoader, |
65 | dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) | 65 | dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) |
66 | { | 66 | { |
67 | m_log.Info("[HGScene]: Starting HGScene."); | 67 | m_log.Info("[HGScene]: Starting HGScene."); |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 480b750..18afb86 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -120,8 +120,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
120 | /// </summary> | 120 | /// </summary> |
121 | protected Dictionary<UUID, Caps> m_capsHandlers = new Dictionary<UUID, Caps>(); | 121 | protected Dictionary<UUID, Caps> m_capsHandlers = new Dictionary<UUID, Caps>(); |
122 | 122 | ||
123 | protected BaseHttpServer m_httpListener; | ||
124 | |||
125 | /// <value> | 123 | /// <value> |
126 | /// All the region modules attached to this scene. | 124 | /// All the region modules attached to this scene. |
127 | /// </value> | 125 | /// </value> |
@@ -300,7 +298,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
300 | 298 | ||
301 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, | 299 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, |
302 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, | 300 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, |
303 | AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, | 301 | AssetCache assetCach, StorageManager storeManager, |
304 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, | 302 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, |
305 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | 303 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) |
306 | { | 304 | { |
@@ -351,7 +349,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
351 | 349 | ||
352 | RegisterDefaultSceneEvents(); | 350 | RegisterDefaultSceneEvents(); |
353 | 351 | ||
354 | m_httpListener = httpServer; | ||
355 | m_dumpAssetsToFile = dumpAssetsToFile; | 352 | m_dumpAssetsToFile = dumpAssetsToFile; |
356 | 353 | ||
357 | m_scripts_enabled = !RegionInfo.RegionSettings.DisableScripts; | 354 | m_scripts_enabled = !RegionInfo.RegionSettings.DisableScripts; |
@@ -2874,8 +2871,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
2874 | return; | 2871 | return; |
2875 | } | 2872 | } |
2876 | 2873 | ||
2877 | cap = new Caps(AssetCache, m_httpListener, m_regInfo.ExternalHostName, m_httpListener.Port, | 2874 | cap |
2878 | capsObjectPath, agentId, m_dumpAssetsToFile, RegionInfo.RegionName); | 2875 | = new Caps( |
2876 | AssetCache, CommsManager.HttpServer, m_regInfo.ExternalHostName, CommsManager.HttpServer.Port, | ||
2877 | capsObjectPath, agentId, m_dumpAssetsToFile, RegionInfo.RegionName); | ||
2878 | |||
2879 | cap.RegisterHandlers(); | 2879 | cap.RegisterHandlers(); |
2880 | 2880 | ||
2881 | EventManager.TriggerOnRegisterCaps(agentId, cap); | 2881 | EventManager.TriggerOnRegisterCaps(agentId, cap); |
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs index 5212f94..13ccce2 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs +++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs | |||
@@ -60,11 +60,10 @@ namespace OpenSim.Region.Environment.Scenes.Tests | |||
60 | AssetCache ac = new AssetCache(assetService); | 60 | AssetCache ac = new AssetCache(assetService); |
61 | 61 | ||
62 | StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", ""); | 62 | StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", ""); |
63 | BaseHttpServer httpServer = new BaseHttpServer(666); | ||
64 | IConfigSource configSource = new IniConfigSource(); | 63 | IConfigSource configSource = new IniConfigSource(); |
65 | 64 | ||
66 | TestScene testScene = new TestScene( | 65 | TestScene testScene = new TestScene( |
67 | regInfo, acm, cm, scs, ac, sm, httpServer, null, false, false, false, configSource, null); | 66 | regInfo, acm, cm, scs, ac, sm, null, false, false, false, configSource, null); |
68 | 67 | ||
69 | testScene.LandChannel = new TestLandChannel(); | 68 | testScene.LandChannel = new TestLandChannel(); |
70 | testScene.LoadWorldMap(); | 69 | testScene.LoadWorldMap(); |
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs index c234429..738bc15 100644 --- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs +++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | |||
@@ -53,8 +53,8 @@ namespace OpenSim.Tests.Common.Mock | |||
53 | } | 53 | } |
54 | 54 | ||
55 | public TestCommunicationsManager(NetworkServersInfo serversInfo) | 55 | public TestCommunicationsManager(NetworkServersInfo serversInfo) |
56 | : base(serversInfo, null, null, false, null) | 56 | : base(serversInfo, new BaseHttpServer(666), null, false, null) |
57 | { | 57 | { |
58 | m_userDataPlugin = new TestUserDataPlugin(); | 58 | m_userDataPlugin = new TestUserDataPlugin(); |
59 | m_inventoryDataPlugin = new TestInventoryDataPlugin(); | 59 | m_inventoryDataPlugin = new TestInventoryDataPlugin(); |
60 | 60 | ||
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs index 6b176a1..04b3e74 100644 --- a/OpenSim/Tests/Common/Mock/TestScene.cs +++ b/OpenSim/Tests/Common/Mock/TestScene.cs | |||
@@ -40,10 +40,10 @@ namespace OpenSim.Tests.Common.Mock | |||
40 | public TestScene( | 40 | public TestScene( |
41 | RegionInfo regInfo, AgentCircuitManager authen, | 41 | RegionInfo regInfo, AgentCircuitManager authen, |
42 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, | 42 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, |
43 | AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, | 43 | AssetCache assetCach, StorageManager storeManager, |
44 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, | 44 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, |
45 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | 45 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) |
46 | : base(regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, httpServer, moduleLoader, | 46 | : base(regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, moduleLoader, |
47 | dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) | 47 | dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) |
48 | { | 48 | { |
49 | } | 49 | } |