From bd2180d9af21dd54d4199a9381afa3e43e913823 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Thu, 19 Mar 2009 18:11:44 +0000
Subject: * refactor: Create IHttpServer interface instead of accessing
 BaseHttpServer via CommunicationsManager directly

---
 .../CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs      | 4 ++--
 OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs      | 3 ++-
 OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs  | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index 488e55b..a50eb2d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -38,7 +38,7 @@ using Nwc.XmlRpc;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
@@ -133,7 +133,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney
             if (m_enabled)
             {
                 scene.RegisterModuleInterface<IMoneyModule>(this);
-                BaseHttpServer httpServer = scene.CommsManager.HttpServer;
+                IHttpServer httpServer = scene.CommsManager.HttpServer;
 
                 lock (m_scenel)
                 {
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
index f8c7c79..4baefc4 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
@@ -35,6 +35,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
@@ -116,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
             IAssetDataPlugin m_assetProvider 
                 = ((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin;
 
-            BaseHttpServer httpServer = m_scene.CommsManager.HttpServer;
+            IHttpServer httpServer = m_scene.CommsManager.HttpServer;
             httpServer.AddStreamHandler(new GetAssetStreamHandler(m_assetProvider));
             httpServer.AddStreamHandler(new PostAssetStreamHandler(m_assetProvider));
 
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
index 6ad032e..cff3611 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
@@ -35,6 +35,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
@@ -114,7 +115,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
 
         protected void AddHttpHandlers(Scene m_scene)
         {
-            BaseHttpServer httpServer = m_scene.CommsManager.HttpServer;
+            IHttpServer httpServer = m_scene.CommsManager.HttpServer;
             
             httpServer.AddStreamHandler(
                 new RestDeserialiseSecureHandler<Guid, InventoryCollection>(
-- 
cgit v1.1