aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-10 02:22:26 +0000
committerMelanie Thielker2009-07-10 02:22:26 +0000
commitc310fb11f492419de60b4bf8e5bb234e4589b336 (patch)
treea7bccfad7cde51ec830fdad59d5729091b2e69ae /OpenSim/Region/Communications/Local/CommunicationsLocal.cs
parentCreate a MainServer static class to access the regions server's HTTP server (diff)
downloadopensim-SC-c310fb11f492419de60b4bf8e5bb234e4589b336.zip
opensim-SC-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.gz
opensim-SC-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.bz2
opensim-SC-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.xz
Remove all references to HttpServer from CommsManager (all incarnations)
Change all uses of the HttpServer properties to use the new singleton
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs8
1 files changed, 2 insertions, 6 deletions
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;
31using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
32using OpenSim.Framework.Communications.Cache; 32using OpenSim.Framework.Communications.Cache;
33using OpenSim.Framework.Communications.Osp; 33using OpenSim.Framework.Communications.Osp;
34using OpenSim.Framework.Servers.HttpServer;
35 34
36namespace OpenSim.Region.Communications.Local 35namespace OpenSim.Region.Communications.Local
37{ 36{
@@ -40,11 +39,8 @@ namespace OpenSim.Region.Communications.Local
40 public CommunicationsLocal( 39 public CommunicationsLocal(
41 ConfigSettings configSettings, 40 ConfigSettings configSettings,
42 NetworkServersInfo serversInfo, 41 NetworkServersInfo serversInfo,
43 BaseHttpServer httpServer, 42 LibraryRootFolder libraryRootFolder)
44 IAssetCache assetCache, 43 : base(serversInfo, libraryRootFolder)
45 LibraryRootFolder libraryRootFolder,
46 bool dumpAssetsToFile)
47 : base(serversInfo, httpServer, assetCache, dumpAssetsToFile, libraryRootFolder)
48 { 44 {
49 LocalInventoryService inventoryService = new LocalInventoryService(); 45 LocalInventoryService inventoryService = new LocalInventoryService();
50 List<IInventoryDataPlugin> plugins 46 List<IInventoryDataPlugin> plugins