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/InterGrid/OpenGridProtocolModule.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 '')
-rw-r--r-- | OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index b357805..bcf20be 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -143,8 +143,8 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
143 | { | 143 | { |
144 | if (m_scene.Count == 0) | 144 | if (m_scene.Count == 0) |
145 | { | 145 | { |
146 | scene.CommsManager.HttpServer.AddLLSDHandler("/agent/", ProcessAgentDomainMessage); | 146 | MainServer.Instance.AddLLSDHandler("/agent/", ProcessAgentDomainMessage); |
147 | scene.CommsManager.HttpServer.AddLLSDHandler("/", ProcessRegionDomainSeed); | 147 | MainServer.Instance.AddLLSDHandler("/", ProcessRegionDomainSeed); |
148 | try | 148 | try |
149 | { | 149 | { |
150 | ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation; | 150 | ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation; |
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
169 | // a zero length region name would conflict with are base region seed cap | 169 | // a zero length region name would conflict with are base region seed cap |
170 | if (!SceneListDuplicateCheck(scene.RegionInfo.RegionName) && scene.RegionInfo.RegionName.ToLower() != "agent" && scene.RegionInfo.RegionName.Length > 0) | 170 | if (!SceneListDuplicateCheck(scene.RegionInfo.RegionName) && scene.RegionInfo.RegionName.ToLower() != "agent" && scene.RegionInfo.RegionName.Length > 0) |
171 | { | 171 | { |
172 | scene.CommsManager.HttpServer.AddLLSDHandler( | 172 | MainServer.Instance.AddLLSDHandler( |
173 | "/" + HttpUtility.UrlPathEncode(scene.RegionInfo.RegionName.ToLower()), | 173 | "/" + HttpUtility.UrlPathEncode(scene.RegionInfo.RegionName.ToLower()), |
174 | ProcessRegionDomainSeed); | 174 | ProcessRegionDomainSeed); |
175 | } | 175 | } |