aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs20
1 files changed, 3 insertions, 17 deletions
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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework.Communications.Cache; 31using OpenSim.Framework.Communications.Cache;
32using OpenSim.Framework.Servers.HttpServer;
33 32
34namespace OpenSim.Framework.Communications 33namespace OpenSim.Framework.Communications
35{ 34{
36 /// <summary> 35 /// <summary>
37 /// This class manages references to OpenSim non-region services (asset, inventory, user, etc.) 36 /// This class manages references to OpenSim non-region services (inventory, user, etc.)
38 /// </summary> 37 /// </summary>
39 /// 38 ///
40 /// TODO: Service retrieval needs to be managed via plugin and interfaces requests, as happens for region 39 /// TODO: Service retrieval needs to be managed via plugin and interfaces requests, as happens for region
@@ -99,28 +98,15 @@ namespace OpenSim.Framework.Communications
99 } 98 }
100 protected IUserAdminService m_userAdminService; 99 protected IUserAdminService m_userAdminService;
101 100
102 /// <value>
103 /// OpenSimulator's built in HTTP server
104 /// </value>
105 public IHttpServer HttpServer
106 {
107 get { return m_httpServer; }
108 }
109 protected IHttpServer m_httpServer;
110
111 /// <summary> 101 /// <summary>
112 /// Constructor 102 /// Constructor
113 /// </summary> 103 /// </summary>
114 /// <param name="serversInfo"></param> 104 /// <param name="serversInfo"></param>
115 /// <param name="httpServer"></param> 105 public CommunicationsManager(NetworkServersInfo serversInfo,
116 /// <param name="assetCache"></param> 106 LibraryRootFolder libraryRootFolder)
117 /// <param name="dumpAssetsToFile"></param>
118 public CommunicationsManager(NetworkServersInfo serversInfo, IHttpServer httpServer, IAssetCache assetCache,
119 bool dumpAssetsToFile, LibraryRootFolder libraryRootFolder)
120 { 107 {
121 m_networkServersInfo = serversInfo; 108 m_networkServersInfo = serversInfo;
122 m_userProfileCacheService = new UserProfileCacheService(this, libraryRootFolder); 109 m_userProfileCacheService = new UserProfileCacheService(this, libraryRootFolder);
123 m_httpServer = httpServer;
124 } 110 }
125 111
126 #region Inventory 112 #region Inventory