diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs | 2 |
2 files changed, 3 insertions, 3 deletions
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); |