* refactor: Remove the need to separately pass in the http listener to the scene - this is always available via CommsManager

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
                                      AgentCircuitManager circuitManager)
         {
             HGSceneCommunicationService sceneGridService = new HGSceneCommunicationService(m_commsManager, HGServices);
+            
             return
-                new HGScene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache,
-                          storageManager, m_httpServer,
-                          m_moduleLoader, m_configSettings.DumpAssetsToFile, m_configSettings.PhysicalPrim, m_configSettings.See_into_region_from_neighbor, m_config.Source,
-                          m_version);
+                new HGScene(
+                    regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, storageManager,
+                    m_moduleLoader, m_configSettings.DumpAssetsToFile, m_configSettings.PhysicalPrim, 
+                    m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
         }
 
         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
                                              AgentCircuitManager circuitManager)
         {
             SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager);
-            return
-                new Scene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache,
-                          storageManager, m_httpServer,
-                          m_moduleLoader, m_configSettings.DumpAssetsToFile, m_configSettings.PhysicalPrim, m_configSettings.See_into_region_from_neighbor, m_config.Source,
-                          m_version);
+            
+            return new Scene(
+                regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache,
+                storageManager, m_moduleLoader, m_configSettings.DumpAssetsToFile, m_configSettings.PhysicalPrim, 
+                m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
         }
 
         public void handleRestartRegion(RegionInfo whichRegion)