From c310fb11f492419de60b4bf8e5bb234e4589b336 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 10 Jul 2009 02:22:26 +0000
Subject: Remove all references to HttpServer from CommsManager (all
incarnations) Change all uses of the HttpServer properties to use the new
singleton
---
OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs | 8 ++++----
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 12 ++----------
2 files changed, 6 insertions(+), 14 deletions(-)
(limited to 'OpenSim/Region/Communications/OGS1')
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 03779c5..323f813 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -35,11 +35,11 @@ namespace OpenSim.Region.Communications.OGS1
public class CommunicationsOGS1 : CommunicationsManager
{
public CommunicationsOGS1(
- NetworkServersInfo serversInfo, BaseHttpServer httpServer,
- IAssetCache assetCache, LibraryRootFolder libraryRootFolder)
- : base(serversInfo, httpServer, assetCache, false, libraryRootFolder)
+ NetworkServersInfo serversInfo,
+ LibraryRootFolder libraryRootFolder)
+ : base(serversInfo, libraryRootFolder)
{
- OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer);
+ OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo);
m_gridService = gridInterComms;
if (serversInfo.secureInventoryServer)
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index a526bb2..9ba84a7 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -59,7 +59,6 @@ namespace OpenSim.Region.Communications.OGS1
public BaseHttpServer httpListener;
public NetworkServersInfo serversInfo;
- public BaseHttpServer httpServer;
public string gdebugRegionName
{
@@ -85,19 +84,12 @@ namespace OpenSim.Region.Communications.OGS1
///
///
///
- public OGS1GridServices(NetworkServersInfo servers_info, BaseHttpServer httpServe)
+ public OGS1GridServices(NetworkServersInfo servers_info)
{
serversInfo = servers_info;
- httpServer = httpServe;
//Respond to Grid Services requests
- // httpServer.AddXmlRPCHandler("expect_user", ExpectUser);
- // httpServer.AddXmlRPCHandler("logoff_user", LogOffUser);
- httpServer.AddXmlRPCHandler("check", PingCheckReply);
-
- // Retired into the new service connectors, 6/14/09
- //httpServer.AddXmlRPCHandler("land_data", LandData);
-
+ MainServer.Instance.AddXmlRPCHandler("check", PingCheckReply);
}
// see IGridServices
--
cgit v1.1