diff options
Diffstat (limited to '')
3 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs index b1a202f..2a04348 100644 --- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs | |||
@@ -91,7 +91,7 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue | |||
91 | // Register fallback handler | 91 | // Register fallback handler |
92 | // Why does EQG Fail on region crossings! | 92 | // Why does EQG Fail on region crossings! |
93 | 93 | ||
94 | //scene.AddLLSDHandler("/CAPS/EQG/", EventQueueFallBack); | 94 | //scene.CommsManager.HttpServer.AddLLSDHandler("/CAPS/EQG/", EventQueueFallBack); |
95 | 95 | ||
96 | scene.EventManager.OnNewClient += OnNewClient; | 96 | scene.EventManager.OnNewClient += OnNewClient; |
97 | 97 | ||
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs index cbc4615..8534b56 100644 --- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -147,8 +147,8 @@ namespace OpenSim.Region.Environment.Modules.InterGrid | |||
147 | { | 147 | { |
148 | if (m_scene.Count == 0) | 148 | if (m_scene.Count == 0) |
149 | { | 149 | { |
150 | scene.AddLLSDHandler("/agent/", ProcessAgentDomainMessage); | 150 | scene.CommsManager.HttpServer.AddLLSDHandler("/agent/", ProcessAgentDomainMessage); |
151 | scene.AddLLSDHandler("/", ProcessRegionDomainSeed); | 151 | scene.CommsManager.HttpServer.AddLLSDHandler("/", ProcessRegionDomainSeed); |
152 | try | 152 | try |
153 | { | 153 | { |
154 | ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation; | 154 | ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation; |
@@ -173,7 +173,9 @@ namespace OpenSim.Region.Environment.Modules.InterGrid | |||
173 | // a zero length region name would conflict with are base region seed cap | 173 | // a zero length region name would conflict with are base region seed cap |
174 | if (!SceneListDuplicateCheck(scene.RegionInfo.RegionName) && scene.RegionInfo.RegionName.ToLower() != "agent" && scene.RegionInfo.RegionName.Length > 0) | 174 | if (!SceneListDuplicateCheck(scene.RegionInfo.RegionName) && scene.RegionInfo.RegionName.ToLower() != "agent" && scene.RegionInfo.RegionName.Length > 0) |
175 | { | 175 | { |
176 | scene.AddLLSDHandler("/" + HttpUtility.UrlPathEncode(scene.RegionInfo.RegionName.ToLower()),ProcessRegionDomainSeed); | 176 | scene.CommsManager.HttpServer.AddLLSDHandler( |
177 | "/" + HttpUtility.UrlPathEncode(scene.RegionInfo.RegionName.ToLower()), | ||
178 | ProcessRegionDomainSeed); | ||
177 | } | 179 | } |
178 | 180 | ||
179 | if (!m_scene.Contains(scene)) | 181 | if (!m_scene.Contains(scene)) |
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs index 50fb028..dd2fb49 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs | |||
@@ -125,7 +125,8 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
125 | m_log.Warn("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage); | 125 | m_log.Warn("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage); |
126 | 126 | ||
127 | m_scene.AddHTTPHandler(regionimage, OnHTTPGetMapImage); | 127 | m_scene.AddHTTPHandler(regionimage, OnHTTPGetMapImage); |
128 | m_scene.AddLLSDHandler("/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest); | 128 | m_scene.CommsManager.HttpServer.AddLLSDHandler( |
129 | "/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest); | ||
129 | 130 | ||
130 | m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; | 131 | m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; |
131 | m_scene.EventManager.OnNewClient += OnNewClient; | 132 | m_scene.EventManager.OnNewClient += OnNewClient; |