aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-06 14:44:45 +0000
committerJustin Clarke Casey2009-01-06 14:44:45 +0000
commitfde6a1665cf052194c7480be01048bb4bb549d7e (patch)
tree876b961fc82e750adacea91f45f00c7ced20222a /OpenSim/Region/Environment/Modules/Framework
parent* refactor: call AddStreamHandler() directly via CommsManager (diff)
downloadopensim-SC-fde6a1665cf052194c7480be01048bb4bb549d7e.zip
opensim-SC-fde6a1665cf052194c7480be01048bb4bb549d7e.tar.gz
opensim-SC-fde6a1665cf052194c7480be01048bb4bb549d7e.tar.bz2
opensim-SC-fde6a1665cf052194c7480be01048bb4bb549d7e.tar.xz
* refactor: call AddHttpHandler() directly via CommsManager
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Framework')
-rw-r--r--OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs5
1 files changed, 3 insertions, 2 deletions
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)