aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/DataSnapshot/DataRequestHandler.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs15
5 files changed, 6 insertions, 20 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index 878aa4b..e2ea546 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.DataSnapshot
53 m_externalData = externalData; 53 m_externalData = externalData;
54 54
55 //Register HTTP handler 55 //Register HTTP handler
56 if (m_scene.AddHTTPHandler("collector", OnGetSnapshot)) 56 if (m_scene.CommsManager.HttpServer.AddHTTPHandler("collector", OnGetSnapshot))
57 { 57 {
58 m_log.Info("[DATASNAPSHOT]: Set up snapshot service"); 58 m_log.Info("[DATASNAPSHOT]: Set up snapshot service");
59 } 59 }
diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
index 4daaab4..7a0bb9b 100644
--- a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
121 121
122 protected virtual void AddHTTPHandlers() 122 protected virtual void AddHTTPHandlers()
123 { 123 {
124 m_aScene.AddHTTPHandler("/agent/", AgentHandler); 124 m_aScene.CommsManager.HttpServer.AddHTTPHandler("/agent/", AgentHandler);
125 } 125 }
126 126
127 #endregion /* IRegionModule */ 127 #endregion /* IRegionModule */
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs
index 2a04348..9006fe0 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs
@@ -233,7 +233,7 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
233 foreach (UUID ky in removeitems) 233 foreach (UUID ky in removeitems)
234 { 234 {
235 m_AvatarQueueUUIDMapping.Remove(ky); 235 m_AvatarQueueUUIDMapping.Remove(ky);
236 m_scene.RemoveHTTPHandler("","/CAPS/EQG/" + ky.ToString() + "/"); 236 m_scene.CommsManager.HttpServer.RemoveHTTPHandler("","/CAPS/EQG/" + ky.ToString() + "/");
237 m_log.Debug("[EVENTQUEUE]: Removing " + "/CAPS/EQG/" + ky.ToString() + "/"); 237 m_log.Debug("[EVENTQUEUE]: Removing " + "/CAPS/EQG/" + ky.ToString() + "/");
238 } 238 }
239 239
@@ -328,7 +328,8 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
328 })); 328 }));
329 329
330 // This will persist this beyond the expiry of the caps handlers 330 // This will persist this beyond the expiry of the caps handlers
331 m_scene.AddHTTPHandler(capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2); 331 m_scene.CommsManager.HttpServer.AddHTTPHandler(
332 capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2);
332 333
333 Random rnd = new Random(System.Environment.TickCount); 334 Random rnd = new Random(System.Environment.TickCount);
334 lock (m_ids) 335 lock (m_ids)
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
index dd2fb49..6ce82ad 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
124 regionimage = regionimage.Replace("-", ""); 124 regionimage = regionimage.Replace("-", "");
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.CommsManager.HttpServer.AddHTTPHandler(regionimage, OnHTTPGetMapImage);
128 m_scene.CommsManager.HttpServer.AddLLSDHandler( 128 m_scene.CommsManager.HttpServer.AddLLSDHandler(
129 "/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest); 129 "/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest);
130 130
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d6b3f0e..480b750 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -4178,20 +4178,6 @@ namespace OpenSim.Region.Environment.Scenes
4178 4178
4179 #endregion 4179 #endregion
4180 4180
4181 #region BaseHTTPServer wrapper methods
4182
4183 public bool AddHTTPHandler(string method, GenericHTTPMethod handler)
4184 {
4185 return m_httpListener.AddHTTPHandler(method, handler);
4186 }
4187
4188 public void RemoveHTTPHandler(string httpMethod, string path)
4189 {
4190 m_httpListener.RemoveHTTPHandler(httpMethod, path);
4191 }
4192
4193 #endregion
4194
4195 #region Avatar Appearance Default 4181 #region Avatar Appearance Default
4196 4182
4197 public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams) 4183 public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams)
@@ -4480,7 +4466,6 @@ namespace OpenSim.Region.Environment.Scenes
4480 4466
4481 protected internal void jointMoved(PhysicsJoint joint) 4467 protected internal void jointMoved(PhysicsJoint joint)
4482 { 4468 {
4483
4484 // m_parentScene.PhysicsScene.DumpJointInfo(); // non-thread-locked version; we should already be in a lock (OdeLock) when this callback is invoked 4469 // m_parentScene.PhysicsScene.DumpJointInfo(); // non-thread-locked version; we should already be in a lock (OdeLock) when this callback is invoked
4485 // FIXME: this causes a sequential lookup of all objects in the scene; use a dictionary 4470 // FIXME: this causes a sequential lookup of all objects in the scene; use a dictionary
4486 SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene); 4471 SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene);