diff options
author | Melanie Thielker | 2009-07-10 02:22:26 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-07-10 02:22:26 +0000 |
commit | c310fb11f492419de60b4bf8e5bb234e4589b336 (patch) | |
tree | a7bccfad7cde51ec830fdad59d5729091b2e69ae /OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs | |
parent | Create a MainServer static class to access the regions server's HTTP server (diff) | |
download | opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.zip opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.gz opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.bz2 opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.xz |
Remove all references to HttpServer from CommsManager (all incarnations)
Change all uses of the HttpServer properties to use the new singleton
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs index f98a9ff..81ea267 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs | |||
@@ -226,7 +226,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
226 | foreach (UUID ky in removeitems) | 226 | foreach (UUID ky in removeitems) |
227 | { | 227 | { |
228 | m_AvatarQueueUUIDMapping.Remove(ky); | 228 | m_AvatarQueueUUIDMapping.Remove(ky); |
229 | m_scene.CommsManager.HttpServer.RemoveHTTPHandler("","/CAPS/EQG/" + ky.ToString() + "/"); | 229 | MainServer.Instance.RemoveHTTPHandler("","/CAPS/EQG/" + ky.ToString() + "/"); |
230 | } | 230 | } |
231 | 231 | ||
232 | } | 232 | } |
@@ -315,7 +315,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
315 | })); | 315 | })); |
316 | 316 | ||
317 | // This will persist this beyond the expiry of the caps handlers | 317 | // This will persist this beyond the expiry of the caps handlers |
318 | m_scene.CommsManager.HttpServer.AddHTTPHandler( | 318 | MainServer.Instance.AddHTTPHandler( |
319 | capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2); | 319 | capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2); |
320 | 320 | ||
321 | Random rnd = new Random(Environment.TickCount); | 321 | Random rnd = new Random(Environment.TickCount); |