OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Trying to streamline CommunicationsManager

afrisby
lbsa71 2007-09-24 05:30:03 +00:00
parent 6c41efa4e3
commit 9ccab46ae8
3 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,18 +37,18 @@ namespace OpenSim.Framework.Communications
{ {
public class CommunicationsManager public class CommunicationsManager
{ {
private AssetCache m_assetCache; protected AssetCache m_assetCache;
private IGridServices m_gridServer; protected IGridServices m_gridServer;
private IInterRegionCommunications m_interRegion; protected IInterRegionCommunications m_interRegion;
private IInventoryServices m_inventoryServer; protected IInventoryServices m_inventoryServer;
private AssetTransactionManager m_transactionsManager; protected AssetTransactionManager m_transactionsManager;
private UserProfileCache m_userProfiles; protected UserProfileCache m_userProfiles;
private IUserServices m_userServer; protected IUserServices m_userServer;
private NetworkServersInfo m_networkServersInfo; protected NetworkServersInfo m_networkServersInfo;
public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache) public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache)
{ {
this.m_networkServersInfo = serversInfo; m_networkServersInfo = serversInfo;
m_assetCache = assetCache; m_assetCache = assetCache;
m_userProfiles = new UserProfileCache(this); m_userProfiles = new UserProfileCache(this);
m_transactionsManager = new AssetTransactionManager(this); m_transactionsManager = new AssetTransactionManager(this);
@ -63,7 +63,6 @@ namespace OpenSim.Framework.Communications
public IGridServices GridServer public IGridServices GridServer
{ {
get { return m_gridServer; } get { return m_gridServer; }
set { m_gridServer = value; }
} }
public IInventoryServices InventoryServer public IInventoryServices InventoryServer

8
OpenSim/Region/Communications/Local/CommunicationsLocal.cs
View File

@ -60,15 +60,15 @@ namespace OpenSim.Region.Communications.Local
InvenServices = new LocalInventoryService(); InvenServices = new LocalInventoryService();
InvenServices.AddPlugin(m_settings.InventoryPlugin); InvenServices.AddPlugin(m_settings.InventoryPlugin);
InventoryServer = InvenServices; m_inventoryServer = InvenServices;
UserServices = new LocalUserServices(this, serversInfo); UserServices = new LocalUserServices(this, serversInfo);
UserServices.AddPlugin(m_settings.UserDatabasePlugin); UserServices.AddPlugin(m_settings.UserDatabasePlugin);
UserServer = UserServices; m_userServer = UserServices;
InstanceServices = new LocalBackEndServices(); InstanceServices = new LocalBackEndServices();
GridServer = InstanceServices; m_gridServer = InstanceServices;
InterRegion = InstanceServices; m_interRegion = InstanceServices;
//CapsServices = new CAPSService(httpServer); //CapsServices = new CAPSService(httpServer);

12
OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
View File

@ -8,18 +8,14 @@ namespace OpenSim.Region.Communications.OGS1
{ {
public class CommunicationsOGS1 : CommunicationsManager public class CommunicationsOGS1 : CommunicationsManager
{ {
public OGS1InventoryService InvenService;
public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache) public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache)
{ {
OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer); OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer);
GridServer = gridInterComms; m_gridServer = gridInterComms;
InterRegion = gridInterComms; m_interRegion = gridInterComms;
InvenService = new OGS1InventoryService(); m_inventoryServer = new OGS1InventoryService();
InventoryServer = InvenService; m_userServer = new OGS1UserServices(this);
UserServer = new OGS1UserServices(this);
} }
} }
} }