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/World | |
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 '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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) |