diff options
author | Melanie Thielker | 2009-07-10 02:22:26 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-07-10 02:22:26 +0000 |
commit | c310fb11f492419de60b4bf8e5bb234e4589b336 (patch) | |
tree | a7bccfad7cde51ec830fdad59d5729091b2e69ae /OpenSim/Region/CoreModules/ServiceConnectorsIn | |
parent | Create a MainServer static class to access the regions server's HTTP server (diff) | |
download | opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.zip opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.gz opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.bz2 opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.xz |
Remove all references to HttpServer from CommsManager (all incarnations)
Change all uses of the HttpServer properties to use the new singleton
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsIn')
6 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs index 7036588..3d7decc 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs | |||
@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset | |||
93 | 93 | ||
94 | m_log.Info("[RegionAssetService]: Starting..."); | 94 | m_log.Info("[RegionAssetService]: Starting..."); |
95 | 95 | ||
96 | Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer }; | 96 | Object[] args = new Object[] { m_Config, MainServer.Instance }; |
97 | 97 | ||
98 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args); | 98 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args); |
99 | } | 99 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs index b3b4320..a991393 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs | |||
@@ -94,7 +94,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication | |||
94 | if (!m_Registered) | 94 | if (!m_Registered) |
95 | { | 95 | { |
96 | m_Registered = true; | 96 | m_Registered = true; |
97 | new HGAuthServiceInConnector(m_Config, scene.CommsManager.HttpServer); | 97 | new HGAuthServiceInConnector(m_Config, MainServer.Instance); |
98 | 98 | ||
99 | //Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer }; | 99 | //Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer }; |
100 | //ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Server.Handlers.dll:HGAuthServiceInConnector", args); | 100 | //ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Server.Handlers.dll:HGAuthServiceInConnector", args); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs index 480500a..0ed7464 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs | |||
@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory | |||
93 | 93 | ||
94 | m_log.Info("[RegionInventoryService]: Starting..."); | 94 | m_log.Info("[RegionInventoryService]: Starting..."); |
95 | 95 | ||
96 | Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer }; | 96 | Object[] args = new Object[] { m_Config, MainServer.Instance }; |
97 | 97 | ||
98 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args); | 98 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args); |
99 | } | 99 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs index a3b2440..213a769 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs | |||
@@ -94,7 +94,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land | |||
94 | if (!m_Registered) | 94 | if (!m_Registered) |
95 | { | 95 | { |
96 | m_Registered = true; | 96 | m_Registered = true; |
97 | Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, this, scene }; | 97 | Object[] args = new Object[] { m_Config, MainServer.Instance, this, scene }; |
98 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:LandServiceInConnector", args); | 98 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:LandServiceInConnector", args); |
99 | } | 99 | } |
100 | 100 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs index a6c2e7c..f283c89 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs | |||
@@ -94,7 +94,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour | |||
94 | if (!m_Registered) | 94 | if (!m_Registered) |
95 | { | 95 | { |
96 | m_Registered = true; | 96 | m_Registered = true; |
97 | Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, this, scene }; | 97 | Object[] args = new Object[] { m_Config, MainServer.Instance, this, scene }; |
98 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:NeighbourServiceInConnector", args); | 98 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:NeighbourServiceInConnector", args); |
99 | } | 99 | } |
100 | 100 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs index 151b455..9e7e10d 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs | |||
@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation | |||
93 | 93 | ||
94 | m_log.Info("[SIM SERVICE]: Starting..."); | 94 | m_log.Info("[SIM SERVICE]: Starting..."); |
95 | 95 | ||
96 | Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, scene }; | 96 | Object[] args = new Object[] { m_Config, MainServer.Instance, scene }; |
97 | 97 | ||
98 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:SimulationServiceInConnector", args); | 98 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:SimulationServiceInConnector", args); |
99 | } | 99 | } |