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

---
 .../CreateCommsManager/CreateCommsManagerPlugin.cs             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/ApplicationPlugins')

diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index d56a9d9..4d6467a 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -168,8 +168,8 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
         {
             m_commsManager
                 = new CommunicationsLocal(
-                    m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache,
-                    libraryRootFolder, false);
+                    m_openSim.ConfigurationSettings, m_openSim.NetServersInfo,
+                    libraryRootFolder);
 
             CreateGridInfoService();
         }
@@ -177,7 +177,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
         protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder)
         {
             m_commsManager
-                = new CommunicationsOGS1(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, libraryRootFolder);
+                = new CommunicationsOGS1(m_openSim.NetServersInfo, libraryRootFolder);
 
             m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
             m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
@@ -206,8 +206,8 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
         {
             m_commsManager 
                 = new HGCommunicationsGridMode(
-                    m_openSim.NetServersInfo, m_httpServer, 
-                    m_openSim.AssetCache, m_openSim.SceneManager, libraryRootFolder);
+                    m_openSim.NetServersInfo,
+                    m_openSim.SceneManager, libraryRootFolder);
 
             HGServices = ((HGCommunicationsGridMode) m_commsManager).HGServices;
 
-- 
cgit v1.1