ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

* refactor: call AddHttpHandler() directly via CommsManager

Browse Source
This commit is contained in:
Justin Clarke Casey
2009-01-06 14:44:45 +00:00
parent b07c188b7e
commit fde6a1665c
5 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
View File

@@ -121,7 +121,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
protected virtual void AddHTTPHandlers()
{
m_aScene.AddHTTPHandler("/agent/", AgentHandler);
m_aScene.CommsManager.HttpServer.AddHTTPHandler("/agent/", AgentHandler);
}
#endregion /* IRegionModule */

5
OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs
View File

@@ -233,7 +233,7 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
foreach (UUID ky in removeitems)
{
m_AvatarQueueUUIDMapping.Remove(ky);
m_scene.RemoveHTTPHandler("","/CAPS/EQG/" + ky.ToString() + "/");
m_scene.CommsManager.HttpServer.RemoveHTTPHandler("","/CAPS/EQG/" + ky.ToString() + "/");
m_log.Debug("[EVENTQUEUE]: Removing " + "/CAPS/EQG/" + ky.ToString() + "/");
}
@@ -328,7 +328,8 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
}));
// This will persist this beyond the expiry of the caps handlers
m_scene.AddHTTPHandler(capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2);
m_scene.CommsManager.HttpServer.AddHTTPHandler(
capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2);
Random rnd = new Random(System.Environment.TickCount);
lock (m_ids)

2
OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
View File

@@ -124,7 +124,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
regionimage = regionimage.Replace("-", "");
m_log.Warn("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage);
m_scene.AddHTTPHandler(regionimage, OnHTTPGetMapImage);
m_scene.CommsManager.HttpServer.AddHTTPHandler(regionimage, OnHTTPGetMapImage);
m_scene.CommsManager.HttpServer.AddLLSDHandler(
"/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest);