Remove all references to HttpServer from CommsManager (all incarnations)

Change all uses of the HttpServer properties to use the new singleton

8 files changed, 24 insertions, 41 deletions

diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
index 6767c32..0e7ab9b 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
@@ -50,12 +50,12 @@ namespace OpenSim.Region.Communications.Hypergrid
         }
 
         public HGCommunicationsGridMode(
-            NetworkServersInfo serversInfo, BaseHttpServer httpServer,
-            IAssetCache assetCache, SceneManager sman, LibraryRootFolder libraryRootFolder)
-            : base(serversInfo, httpServer, assetCache, false, libraryRootFolder)
+            NetworkServersInfo serversInfo,
+            SceneManager sman, LibraryRootFolder libraryRootFolder)
+            : base(serversInfo, libraryRootFolder)
         {
             // From constructor at CommunicationsOGS1
-            HGGridServices gridInterComms = new HGGridServicesGridMode(serversInfo, httpServer, assetCache, sman, m_userProfileCacheService);
+            HGGridServices gridInterComms = new HGGridServicesGridMode(serversInfo, sman, m_userProfileCacheService);
             m_gridService = gridInterComms;
             m_osw = gridInterComms;
 
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index f9c8075..3ea987c 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Communications.Hypergrid
             HGGridServices gridService, 
             LibraryRootFolder libraryRootFolder, 
             bool dumpAssetsToFile)
-            : base(serversInfo, httpServer, assetCache, dumpAssetsToFile, libraryRootFolder)
+            : base(serversInfo, libraryRootFolder)
         {           
             LocalUserServices localUserService =
                 new LocalUserServices(
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index 58711e5..54cde0f 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -63,7 +63,6 @@ namespace OpenSim.Region.Communications.Hypergrid
 
         public BaseHttpServer httpListener;
         public NetworkServersInfo serversInfo;
-        public BaseHttpServer httpServer;
 
         protected List<RegionInfo> m_regionsOnInstance = new List<RegionInfo>();
 
@@ -76,7 +75,6 @@ namespace OpenSim.Region.Communications.Hypergrid
         // This is key-ed on agent ID
         protected Dictionary<UUID, RegionInfo> m_knownRegions = new Dictionary<UUID, RegionInfo>();
 
-        protected IAssetCache m_assetcache;
         protected UserProfileCacheService m_userProfileCache;
         protected SceneManager m_sceneman;
 
@@ -112,18 +110,15 @@ namespace OpenSim.Region.Communications.Hypergrid
         /// Contructor.  Adds "expect_hg_user" and "check" xmlrpc method handlers
         /// </summary>
         /// <param name="servers_info"></param>
-        /// <param name="httpServe"></param>
-        public HGGridServices(NetworkServersInfo servers_info, BaseHttpServer httpServe, IAssetCache asscache, SceneManager sman)
+        public HGGridServices(NetworkServersInfo servers_info, SceneManager sman)
         {
             serversInfo = servers_info;
-            httpServer = httpServe;
-            m_assetcache = asscache;
             m_sceneman = sman;
 
             random = new Random();
 
-            httpServer.AddXmlRPCHandler("link_region", LinkRegionRequest);
-            httpServer.AddXmlRPCHandler("expect_hg_user", ExpectHGUser);
+            MainServer.Instance.AddXmlRPCHandler("link_region", LinkRegionRequest);
+            MainServer.Instance.AddXmlRPCHandler("expect_hg_user", ExpectHGUser);
 
             HGNetworkServersInfo.Init(servers_info.AssetURL, servers_info.InventoryURL, servers_info.UserURL);
         }
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
index 09a7fcc..5ce1e79 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
@@ -65,11 +65,11 @@ namespace OpenSim.Region.Communications.Hypergrid
             set { m_remoteBackend.RegionLoginsEnabled = value; }
         }      
 
-        public HGGridServicesGridMode(NetworkServersInfo servers_info, BaseHttpServer httpServe, 
-            IAssetCache asscache, SceneManager sman, UserProfileCacheService userv)
-            : base(servers_info, httpServe, asscache, sman)
+        public HGGridServicesGridMode(NetworkServersInfo servers_info,
+            SceneManager sman, UserProfileCacheService userv)
+            : base(servers_info, sman)
         {
-            m_remoteBackend = new OGS1GridServices(servers_info, httpServe);
+            m_remoteBackend = new OGS1GridServices(servers_info);
             m_userProfileCache = userv;
         }
 
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
index e195853..828d0d9 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
@@ -77,12 +77,12 @@ namespace OpenSim.Region.Communications.Hypergrid
 
 
         public HGGridServicesStandalone(NetworkServersInfo servers_info, BaseHttpServer httpServe, IAssetCache asscache, SceneManager sman)
-            : base(servers_info, httpServe, asscache, sman)
+            : base(servers_info, sman)
         {
             //Respond to Grid Services requests
-            httpServer.AddXmlRPCHandler("logoff_user", LogOffUser);
-            httpServer.AddXmlRPCHandler("check", PingCheckReply);
-            httpServer.AddXmlRPCHandler("land_data", LandData);
+            MainServer.Instance.AddXmlRPCHandler("logoff_user", LogOffUser);
+            MainServer.Instance.AddXmlRPCHandler("check", PingCheckReply);
+            MainServer.Instance.AddXmlRPCHandler("land_data", LandData);
 
         }
 
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index ac3d64e..ceab75b 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -31,7 +31,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Osp;
-using OpenSim.Framework.Servers.HttpServer;
 
 namespace OpenSim.Region.Communications.Local
 {
@@ -40,11 +39,8 @@ namespace OpenSim.Region.Communications.Local
         public CommunicationsLocal(
             ConfigSettings configSettings,                                   
             NetworkServersInfo serversInfo,
-            BaseHttpServer httpServer,
-            IAssetCache assetCache,
-            LibraryRootFolder libraryRootFolder, 
-            bool dumpAssetsToFile)
-            : base(serversInfo, httpServer, assetCache, dumpAssetsToFile, libraryRootFolder)
+            LibraryRootFolder libraryRootFolder)
+            : base(serversInfo, libraryRootFolder)
         {
             LocalInventoryService inventoryService = new LocalInventoryService();
             List<IInventoryDataPlugin> plugins 
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
         /// </summary>
         /// <param name="servers_info"></param>
         /// <param name="httpServe"></param>
-        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