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

---
 .../Communications/CommunicationsManager.cs          | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'OpenSim/Framework/Communications')

diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index c78212d..e1a70e5 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -29,12 +29,11 @@ using System;
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers.HttpServer;
 
 namespace OpenSim.Framework.Communications
 {
     /// <summary>
-    /// This class manages references to OpenSim non-region services (asset, inventory, user, etc.)
+    /// This class manages references to OpenSim non-region services (inventory, user, etc.)
     /// </summary>
     /// 
     /// TODO: Service retrieval needs to be managed via plugin and interfaces requests, as happens for region
@@ -99,28 +98,15 @@ namespace OpenSim.Framework.Communications
         }        
         protected IUserAdminService m_userAdminService;        
 
-        /// <value>
-        /// OpenSimulator's built in HTTP server
-        /// </value>
-        public IHttpServer HttpServer
-        {
-            get { return m_httpServer; }
-        }
-        protected IHttpServer m_httpServer;
-
         /// <summary>
         /// Constructor
         /// </summary>
         /// <param name="serversInfo"></param>
-        /// <param name="httpServer"></param>
-        /// <param name="assetCache"></param>
-        /// <param name="dumpAssetsToFile"></param>
-        public CommunicationsManager(NetworkServersInfo serversInfo, IHttpServer httpServer, IAssetCache assetCache,
-                                     bool dumpAssetsToFile, LibraryRootFolder libraryRootFolder)
+        public CommunicationsManager(NetworkServersInfo serversInfo,
+                                     LibraryRootFolder libraryRootFolder)
         {
             m_networkServersInfo = serversInfo;
             m_userProfileCacheService = new UserProfileCacheService(this, libraryRootFolder);
-            m_httpServer = httpServer;
         }
 
         #region Inventory
-- 
cgit v1.1