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 | |
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 '')
17 files changed, 26 insertions, 26 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs index ad2c7aa..0c7882a 100644 --- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs | |||
@@ -103,8 +103,8 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities | |||
103 | 103 | ||
104 | Caps caps | 104 | Caps caps |
105 | = new Caps( | 105 | = new Caps( |
106 | m_scene.AssetService, m_scene.CommsManager.HttpServer, m_scene.RegionInfo.ExternalHostName, | 106 | m_scene.AssetService, MainServer.Instance, m_scene.RegionInfo.ExternalHostName, |
107 | m_scene.CommsManager.HttpServer.Port, | 107 | MainServer.Instance.Port, |
108 | capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName); | 108 | capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName); |
109 | 109 | ||
110 | caps.RegisterHandlers(); | 110 | caps.RegisterHandlers(); |
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 52d0948..b6250a2 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -117,8 +117,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
117 | { | 117 | { |
118 | if (m_scenes.Count == 0) | 118 | if (m_scenes.Count == 0) |
119 | { | 119 | { |
120 | scene.CommsManager.HttpServer.AddXmlRPCHandler("presence_update_bulk", processPresenceUpdateBulk); | 120 | MainServer.Instance.AddXmlRPCHandler("presence_update_bulk", processPresenceUpdateBulk); |
121 | scene.CommsManager.HttpServer.AddXmlRPCHandler("terminate_friend", processTerminateFriend); | 121 | MainServer.Instance.AddXmlRPCHandler("terminate_friend", processTerminateFriend); |
122 | m_friendLists.DefaultTTL = new TimeSpan(1, 0, 0); // store entries for one hour max | 122 | m_friendLists.DefaultTTL = new TimeSpan(1, 0, 0); // store entries for one hour max |
123 | m_initialScene = scene; | 123 | m_initialScene = scene; |
124 | } | 124 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 70fbcd4..5e7cf4b 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
68 | { | 68 | { |
69 | if (m_Scenes.Count == 0) | 69 | if (m_Scenes.Count == 0) |
70 | { | 70 | { |
71 | scene.CommsManager.HttpServer.AddXmlRPCHandler( | 71 | MainServer.Instance.AddXmlRPCHandler( |
72 | "grid_instant_message", processXMLRPCGridInstantMessage); | 72 | "grid_instant_message", processXMLRPCGridInstantMessage); |
73 | } | 73 | } |
74 | 74 | ||
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs index f98a9ff..81ea267 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs | |||
@@ -226,7 +226,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
226 | foreach (UUID ky in removeitems) | 226 | foreach (UUID ky in removeitems) |
227 | { | 227 | { |
228 | m_AvatarQueueUUIDMapping.Remove(ky); | 228 | m_AvatarQueueUUIDMapping.Remove(ky); |
229 | m_scene.CommsManager.HttpServer.RemoveHTTPHandler("","/CAPS/EQG/" + ky.ToString() + "/"); | 229 | MainServer.Instance.RemoveHTTPHandler("","/CAPS/EQG/" + ky.ToString() + "/"); |
230 | } | 230 | } |
231 | 231 | ||
232 | } | 232 | } |
@@ -315,7 +315,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
315 | })); | 315 | })); |
316 | 316 | ||
317 | // This will persist this beyond the expiry of the caps handlers | 317 | // This will persist this beyond the expiry of the caps handlers |
318 | m_scene.CommsManager.HttpServer.AddHTTPHandler( | 318 | MainServer.Instance.AddHTTPHandler( |
319 | capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2); | 319 | capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2); |
320 | 320 | ||
321 | Random rnd = new Random(Environment.TickCount); | 321 | Random rnd = new Random(Environment.TickCount); |
diff --git a/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs b/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs index b900219..8c92727 100644 --- a/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs +++ b/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs | |||
@@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.Framework.Services | |||
124 | // IAssetDataPlugin m_assetProvider | 124 | // IAssetDataPlugin m_assetProvider |
125 | // = ((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin; | 125 | // = ((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin; |
126 | 126 | ||
127 | IHttpServer httpServer = m_scene.CommsManager.HttpServer; | 127 | IHttpServer httpServer = MainServer.Instance; |
128 | httpServer.AddXmlRPCHandler("simulator_data_request", XmlRpcSimulatorDataRequestMethod); | 128 | httpServer.AddXmlRPCHandler("simulator_data_request", XmlRpcSimulatorDataRequestMethod); |
129 | //m_httpServer.AddXmlRPCHandler("map_block", XmlRpcMapBlockMethod); | 129 | //m_httpServer.AddXmlRPCHandler("map_block", XmlRpcMapBlockMethod); |
130 | //m_httpServer.AddXmlRPCHandler("search_for_region_by_name", XmlRpcSearchForRegionMethod); | 130 | //m_httpServer.AddXmlRPCHandler("search_for_region_by_name", XmlRpcSearchForRegionMethod); |
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs index 08e1ecd..a5894c6 100644 --- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs +++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs | |||
@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid | |||
100 | //TODO: fix casting. | 100 | //TODO: fix casting. |
101 | LibraryRootFolder rootFolder = m_firstScene.CommsManager.UserProfileCacheService.LibraryRoot as LibraryRootFolder; | 101 | LibraryRootFolder rootFolder = m_firstScene.CommsManager.UserProfileCacheService.LibraryRoot as LibraryRootFolder; |
102 | 102 | ||
103 | IHttpServer httpServer = m_firstScene.CommsManager.HttpServer; | 103 | IHttpServer httpServer = MainServer.Instance; |
104 | 104 | ||
105 | //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference | 105 | //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference |
106 | m_loginService | 106 | m_loginService |
diff --git a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs index a20b5ba..0f2ba32 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs | |||
@@ -89,7 +89,7 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
89 | if (m_settings.Configs["Startup"].GetBoolean("gridmode", false)) | 89 | if (m_settings.Configs["Startup"].GetBoolean("gridmode", false)) |
90 | { | 90 | { |
91 | m_com = m_scenes[0].CommsManager; | 91 | m_com = m_scenes[0].CommsManager; |
92 | m_com.HttpServer.AddXmlRPCHandler("grid_message", GridWideMessage); | 92 | MainServer.Instance.AddXmlRPCHandler("grid_message", GridWideMessage); |
93 | } | 93 | } |
94 | } | 94 | } |
95 | 95 | ||
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index b357805..bcf20be 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -143,8 +143,8 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
143 | { | 143 | { |
144 | if (m_scene.Count == 0) | 144 | if (m_scene.Count == 0) |
145 | { | 145 | { |
146 | scene.CommsManager.HttpServer.AddLLSDHandler("/agent/", ProcessAgentDomainMessage); | 146 | MainServer.Instance.AddLLSDHandler("/agent/", ProcessAgentDomainMessage); |
147 | scene.CommsManager.HttpServer.AddLLSDHandler("/", ProcessRegionDomainSeed); | 147 | MainServer.Instance.AddLLSDHandler("/", ProcessRegionDomainSeed); |
148 | try | 148 | try |
149 | { | 149 | { |
150 | ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation; | 150 | ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation; |
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
169 | // a zero length region name would conflict with are base region seed cap | 169 | // a zero length region name would conflict with are base region seed cap |
170 | if (!SceneListDuplicateCheck(scene.RegionInfo.RegionName) && scene.RegionInfo.RegionName.ToLower() != "agent" && scene.RegionInfo.RegionName.Length > 0) | 170 | if (!SceneListDuplicateCheck(scene.RegionInfo.RegionName) && scene.RegionInfo.RegionName.ToLower() != "agent" && scene.RegionInfo.RegionName.Length > 0) |
171 | { | 171 | { |
172 | scene.CommsManager.HttpServer.AddLLSDHandler( | 172 | MainServer.Instance.AddLLSDHandler( |
173 | "/" + HttpUtility.UrlPathEncode(scene.RegionInfo.RegionName.ToLower()), | 173 | "/" + HttpUtility.UrlPathEncode(scene.RegionInfo.RegionName.ToLower()), |
174 | ProcessRegionDomainSeed); | 174 | ProcessRegionDomainSeed); |
175 | } | 175 | } |
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 5cb1f7d..50d3fbe 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
93 | { | 93 | { |
94 | // There can only be one | 94 | // There can only be one |
95 | // | 95 | // |
96 | m_HttpServer = scene.CommsManager.HttpServer; | 96 | m_HttpServer = MainServer.Instance; |
97 | } | 97 | } |
98 | 98 | ||
99 | scene.RegisterModuleInterface<IUrlModule>(this); | 99 | scene.RegisterModuleInterface<IUrlModule>(this); |
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 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs index 05cc824..7f9167d 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs | |||
@@ -128,8 +128,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion | |||
128 | 128 | ||
129 | protected virtual void AddHTTPHandlers() | 129 | protected virtual void AddHTTPHandlers() |
130 | { | 130 | { |
131 | m_aScene.CommsManager.HttpServer.AddHTTPHandler("/agent/", AgentHandler); | 131 | MainServer.Instance.AddHTTPHandler("/agent/", AgentHandler); |
132 | m_aScene.CommsManager.HttpServer.AddHTTPHandler("/object/", ObjectHandler); | 132 | MainServer.Instance.AddHTTPHandler("/object/", ObjectHandler); |
133 | } | 133 | } |
134 | 134 | ||
135 | #endregion /* IRegionModule */ | 135 | #endregion /* IRegionModule */ |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 16c02a3..cf04fc8 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -144,8 +144,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
144 | regionimage = regionimage.Replace("-", ""); | 144 | regionimage = regionimage.Replace("-", ""); |
145 | m_log.Info("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage); | 145 | m_log.Info("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage); |
146 | 146 | ||
147 | m_scene.CommsManager.HttpServer.AddHTTPHandler(regionimage, OnHTTPGetMapImage); | 147 | MainServer.Instance.AddHTTPHandler(regionimage, OnHTTPGetMapImage); |
148 | m_scene.CommsManager.HttpServer.AddLLSDHandler( | 148 | MainServer.Instance.AddLLSDHandler( |
149 | "/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest); | 149 | "/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest); |
150 | 150 | ||
151 | m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; | 151 | m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; |
@@ -166,9 +166,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
166 | 166 | ||
167 | string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString(); | 167 | string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString(); |
168 | regionimage = regionimage.Replace("-", ""); | 168 | regionimage = regionimage.Replace("-", ""); |
169 | m_scene.CommsManager.HttpServer.RemoveLLSDHandler("/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), | 169 | MainServer.Instance.RemoveLLSDHandler("/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), |
170 | HandleRemoteMapItemRequest); | 170 | HandleRemoteMapItemRequest); |
171 | m_scene.CommsManager.HttpServer.RemoveHTTPHandler("", regionimage); | 171 | MainServer.Instance.RemoveHTTPHandler("", regionimage); |
172 | } | 172 | } |
173 | 173 | ||
174 | public void OnRegisterCaps(UUID agentID, Caps caps) | 174 | public void OnRegisterCaps(UUID agentID, Caps caps) |