aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-06 14:30:50 +0000
committerJustin Clarke Casey2009-01-06 14:30:50 +0000
commit579f11b3b892a92c672a919b361b6961d302d234 (patch)
tree4e86b0957684f4b024c0f9c44cfb6d2faeed3ccb
parent* refactor: drop AddXmlRpcHandler() from scene in favour of call via CommsMan... (diff)
downloadopensim-SC_OLD-579f11b3b892a92c672a919b361b6961d302d234.zip
opensim-SC_OLD-579f11b3b892a92c672a919b361b6961d302d234.tar.gz
opensim-SC_OLD-579f11b3b892a92c672a919b361b6961d302d234.tar.bz2
opensim-SC_OLD-579f11b3b892a92c672a919b361b6961d302d234.tar.xz
* refactor: call AddLLSDHandler directly via CommsManager
-rw-r--r--OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs8
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
4 files changed, 8 insertions, 15 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;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 8e6e258..ac1461e 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -4190,11 +4190,6 @@ namespace OpenSim.Region.Environment.Scenes
4190 m_httpListener.AddStreamHandler(handler); 4190 m_httpListener.AddStreamHandler(handler);
4191 } 4191 }
4192 4192
4193 public bool AddLLSDHandler(string path, LLSDMethod handler)
4194 {
4195 return m_httpListener.AddLLSDHandler(path, handler);
4196 }
4197
4198 public void RemoveStreamHandler(string httpMethod, string path) 4193 public void RemoveStreamHandler(string httpMethod, string path)
4199 { 4194 {
4200 m_httpListener.RemoveStreamHandler(httpMethod, path); 4195 m_httpListener.RemoveStreamHandler(httpMethod, path);
@@ -4205,11 +4200,6 @@ namespace OpenSim.Region.Environment.Scenes
4205 m_httpListener.RemoveHTTPHandler(httpMethod, path); 4200 m_httpListener.RemoveHTTPHandler(httpMethod, path);
4206 } 4201 }
4207 4202
4208 public bool RemoveLLSDHandler(string path, LLSDMethod handler)
4209 {
4210 return m_httpListener.RemoveLLSDHandler(path, handler);
4211 }
4212
4213 #endregion 4203 #endregion
4214 4204
4215 #region Avatar Appearance Default 4205 #region Avatar Appearance Default