OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* refactor: call AddLLSDHandler directly via CommsManager

0.6.2-post-fixes
Justin Clarke Casey 2009-01-06 14:30:50 +00:00
parent 2a4c4ceebb
commit 579f11b3b8
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
// Register fallback handler // Register fallback handler
// Why does EQG Fail on region crossings! // Why does EQG Fail on region crossings!
//scene.AddLLSDHandler("/CAPS/EQG/", EventQueueFallBack); //scene.CommsManager.HttpServer.AddLLSDHandler("/CAPS/EQG/", EventQueueFallBack);
scene.EventManager.OnNewClient += OnNewClient; scene.EventManager.OnNewClient += OnNewClient;

8
OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
View File

@ -147,8 +147,8 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
{ {
if (m_scene.Count == 0) if (m_scene.Count == 0)
{ {
scene.AddLLSDHandler("/agent/", ProcessAgentDomainMessage); scene.CommsManager.HttpServer.AddLLSDHandler("/agent/", ProcessAgentDomainMessage);
scene.AddLLSDHandler("/", ProcessRegionDomainSeed); scene.CommsManager.HttpServer.AddLLSDHandler("/", ProcessRegionDomainSeed);
try try
{ {
ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation; ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation;
@ -173,7 +173,9 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
// a zero length region name would conflict with are base region seed cap // a zero length region name would conflict with are base region seed cap
if (!SceneListDuplicateCheck(scene.RegionInfo.RegionName) && scene.RegionInfo.RegionName.ToLower() != "agent" && scene.RegionInfo.RegionName.Length > 0) if (!SceneListDuplicateCheck(scene.RegionInfo.RegionName) && scene.RegionInfo.RegionName.ToLower() != "agent" && scene.RegionInfo.RegionName.Length > 0)
{ {
scene.AddLLSDHandler("/" + HttpUtility.UrlPathEncode(scene.RegionInfo.RegionName.ToLower()),ProcessRegionDomainSeed); scene.CommsManager.HttpServer.AddLLSDHandler(
"/" + HttpUtility.UrlPathEncode(scene.RegionInfo.RegionName.ToLower()),
ProcessRegionDomainSeed);
} }
if (!m_scene.Contains(scene)) if (!m_scene.Contains(scene))

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

@ -125,7 +125,8 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
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_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.AddHTTPHandler(regionimage, OnHTTPGetMapImage);
m_scene.AddLLSDHandler("/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest); m_scene.CommsManager.HttpServer.AddLLSDHandler(
"/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest);
m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
m_scene.EventManager.OnNewClient += OnNewClient; m_scene.EventManager.OnNewClient += OnNewClient;

10
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -4190,11 +4190,6 @@ namespace OpenSim.Region.Environment.Scenes
m_httpListener.AddStreamHandler(handler); m_httpListener.AddStreamHandler(handler);
} }
public bool AddLLSDHandler(string path, LLSDMethod handler)
{
return m_httpListener.AddLLSDHandler(path, handler);
}
public void RemoveStreamHandler(string httpMethod, string path) public void RemoveStreamHandler(string httpMethod, string path)
{ {
m_httpListener.RemoveStreamHandler(httpMethod, path); m_httpListener.RemoveStreamHandler(httpMethod, path);
@ -4205,11 +4200,6 @@ namespace OpenSim.Region.Environment.Scenes
m_httpListener.RemoveHTTPHandler(httpMethod, path); m_httpListener.RemoveHTTPHandler(httpMethod, path);
} }
public bool RemoveLLSDHandler(string path, LLSDMethod handler)
{
return m_httpListener.RemoveLLSDHandler(path, handler);
}
#endregion #endregion
#region Avatar Appearance Default #region Avatar Appearance Default