aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-06 15:09:52 +0000
committerJustin Clarke Casey2009-01-06 15:09:52 +0000
commitb6ee2f15bacda2a2c22785923b1e41639db5a6db (patch)
tree5608581d1cd1b2f37c149d60e79d81da9cc705ca /OpenSim/Region/Application
parent* refactor: call AddHttpHandler() directly via CommsManager (diff)
downloadopensim-SC_OLD-b6ee2f15bacda2a2c22785923b1e41639db5a6db.zip
opensim-SC_OLD-b6ee2f15bacda2a2c22785923b1e41639db5a6db.tar.gz
opensim-SC_OLD-b6ee2f15bacda2a2c22785923b1e41639db5a6db.tar.bz2
opensim-SC_OLD-b6ee2f15bacda2a2c22785923b1e41639db5a6db.tar.xz
* refactor: Remove the need to separately pass in the http listener to the scene - this is always available via CommsManager
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/HGOpenSimNode.cs9
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs10
2 files changed, 10 insertions, 9 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)