diff options
author | lbsa71 | 2007-09-24 05:30:03 +0000 |
---|---|---|
committer | lbsa71 | 2007-09-24 05:30:03 +0000 |
commit | 9ccab46ae8e65412d898603426de6584629ad05f (patch) | |
tree | 13815d5e41de6461bc927a5cc524b120d66fa82a /OpenSim | |
parent | * reorder and rename (diff) | |
download | opensim-SC-9ccab46ae8e65412d898603426de6584629ad05f.zip opensim-SC-9ccab46ae8e65412d898603426de6584629ad05f.tar.gz opensim-SC-9ccab46ae8e65412d898603426de6584629ad05f.tar.bz2 opensim-SC-9ccab46ae8e65412d898603426de6584629ad05f.tar.xz |
* Trying to streamline CommunicationsManager
Diffstat (limited to 'OpenSim')
3 files changed, 17 insertions, 22 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index e5abb2e..2a87306 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -37,18 +37,18 @@ namespace OpenSim.Framework.Communications | |||
37 | { | 37 | { |
38 | public class CommunicationsManager | 38 | public class CommunicationsManager |
39 | { | 39 | { |
40 | private AssetCache m_assetCache; | 40 | protected AssetCache m_assetCache; |
41 | private IGridServices m_gridServer; | 41 | protected IGridServices m_gridServer; |
42 | private IInterRegionCommunications m_interRegion; | 42 | protected IInterRegionCommunications m_interRegion; |
43 | private IInventoryServices m_inventoryServer; | 43 | protected IInventoryServices m_inventoryServer; |
44 | private AssetTransactionManager m_transactionsManager; | 44 | protected AssetTransactionManager m_transactionsManager; |
45 | private UserProfileCache m_userProfiles; | 45 | protected UserProfileCache m_userProfiles; |
46 | private IUserServices m_userServer; | 46 | protected IUserServices m_userServer; |
47 | private NetworkServersInfo m_networkServersInfo; | 47 | protected NetworkServersInfo m_networkServersInfo; |
48 | 48 | ||
49 | public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache) | 49 | public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache) |
50 | { | 50 | { |
51 | this.m_networkServersInfo = serversInfo; | 51 | m_networkServersInfo = serversInfo; |
52 | m_assetCache = assetCache; | 52 | m_assetCache = assetCache; |
53 | m_userProfiles = new UserProfileCache(this); | 53 | m_userProfiles = new UserProfileCache(this); |
54 | m_transactionsManager = new AssetTransactionManager(this); | 54 | m_transactionsManager = new AssetTransactionManager(this); |
@@ -63,7 +63,6 @@ namespace OpenSim.Framework.Communications | |||
63 | public IGridServices GridServer | 63 | public IGridServices GridServer |
64 | { | 64 | { |
65 | get { return m_gridServer; } | 65 | get { return m_gridServer; } |
66 | set { m_gridServer = value; } | ||
67 | } | 66 | } |
68 | 67 | ||
69 | public IInventoryServices InventoryServer | 68 | public IInventoryServices InventoryServer |
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs index aa0105c..15167fb 100644 --- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs +++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs | |||
@@ -60,15 +60,15 @@ namespace OpenSim.Region.Communications.Local | |||
60 | 60 | ||
61 | InvenServices = new LocalInventoryService(); | 61 | InvenServices = new LocalInventoryService(); |
62 | InvenServices.AddPlugin(m_settings.InventoryPlugin); | 62 | InvenServices.AddPlugin(m_settings.InventoryPlugin); |
63 | InventoryServer = InvenServices; | 63 | m_inventoryServer = InvenServices; |
64 | 64 | ||
65 | UserServices = new LocalUserServices(this, serversInfo); | 65 | UserServices = new LocalUserServices(this, serversInfo); |
66 | UserServices.AddPlugin(m_settings.UserDatabasePlugin); | 66 | UserServices.AddPlugin(m_settings.UserDatabasePlugin); |
67 | UserServer = UserServices; | 67 | m_userServer = UserServices; |
68 | 68 | ||
69 | InstanceServices = new LocalBackEndServices(); | 69 | InstanceServices = new LocalBackEndServices(); |
70 | GridServer = InstanceServices; | 70 | m_gridServer = InstanceServices; |
71 | InterRegion = InstanceServices; | 71 | m_interRegion = InstanceServices; |
72 | 72 | ||
73 | //CapsServices = new CAPSService(httpServer); | 73 | //CapsServices = new CAPSService(httpServer); |
74 | 74 | ||
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs index dd85d54..ca9c34b 100644 --- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs +++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs | |||
@@ -8,18 +8,14 @@ namespace OpenSim.Region.Communications.OGS1 | |||
8 | { | 8 | { |
9 | public class CommunicationsOGS1 : CommunicationsManager | 9 | public class CommunicationsOGS1 : CommunicationsManager |
10 | { | 10 | { |
11 | public OGS1InventoryService InvenService; | ||
12 | |||
13 | public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache) | 11 | public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache) |
14 | { | 12 | { |
15 | OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer); | 13 | OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer); |
16 | GridServer = gridInterComms; | 14 | m_gridServer = gridInterComms; |
17 | InterRegion = gridInterComms; | 15 | m_interRegion = gridInterComms; |
18 | |||
19 | InvenService = new OGS1InventoryService(); | ||
20 | InventoryServer = InvenService; | ||
21 | 16 | ||
22 | UserServer = new OGS1UserServices(this); | 17 | m_inventoryServer = new OGS1InventoryService(); |
18 | m_userServer = new OGS1UserServices(this); | ||
23 | } | 19 | } |
24 | } | 20 | } |
25 | } | 21 | } |