ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove all references to HttpServer from CommsManager (all incarnations)

Browse Source 
Change all uses of the HttpServer properties to use the new singleton
This commit is contained in:
Melanie Thielker
2009-07-10 02:22:26 +00:00
parent 7b457805a3
commit c310fb11f4
39 changed files with 83 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Framework/Communications/CommunicationsManager.cs
View File

@@ -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