diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/CommunicationsManager.cs | 43 |
1 files changed, 26 insertions, 17 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index 80dfa2c..6272872 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -36,68 +36,77 @@ using OpenSim.Framework.Servers; | |||
36 | 36 | ||
37 | namespace OpenSim.Framework.Communications | 37 | namespace OpenSim.Framework.Communications |
38 | { | 38 | { |
39 | /// <summary> | ||
40 | /// This class manages references to OpenSim non-region services (asset, inventory, user, etc.) | ||
41 | /// </summary> | ||
39 | public class CommunicationsManager | 42 | public class CommunicationsManager |
40 | { | 43 | { |
41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
42 | 45 | ||
43 | protected IUserService m_userService; | ||
44 | protected Dictionary<LLUUID, string[]> m_nameRequestCache = new Dictionary<LLUUID, string[]>(); | 46 | protected Dictionary<LLUUID, string[]> m_nameRequestCache = new Dictionary<LLUUID, string[]>(); |
45 | 47 | ||
46 | public IUserService UserService | 48 | public IUserService UserService |
47 | { | 49 | { |
48 | get { return m_userService; } | 50 | get { return m_userService; } |
49 | } | 51 | } |
50 | 52 | protected IUserService m_userService; | |
51 | protected IGridServices m_gridService; | ||
52 | 53 | ||
53 | public IGridServices GridService | 54 | public IGridServices GridService |
54 | { | 55 | { |
55 | get { return m_gridService; } | 56 | get { return m_gridService; } |
56 | } | 57 | } |
57 | 58 | protected IGridServices m_gridService; | |
58 | 59 | ||
59 | protected IInterRegionCommunications m_interRegion; | ||
60 | |||
61 | public IInterRegionCommunications InterRegion | 60 | public IInterRegionCommunications InterRegion |
62 | { | 61 | { |
63 | get { return m_interRegion; } | 62 | get { return m_interRegion; } |
64 | } | 63 | } |
65 | 64 | protected IInterRegionCommunications m_interRegion; | |
66 | protected UserProfileCacheService m_userProfileCacheService; | ||
67 | 65 | ||
68 | public UserProfileCacheService UserProfileCacheService | 66 | public UserProfileCacheService UserProfileCacheService |
69 | { | 67 | { |
70 | get { return m_userProfileCacheService; } | 68 | get { return m_userProfileCacheService; } |
71 | } | 69 | } |
70 | protected UserProfileCacheService m_userProfileCacheService; | ||
72 | 71 | ||
73 | // protected AgentAssetTransactionsManager m_transactionsManager; | 72 | // protected AgentAssetTransactionsManager m_transactionsManager; |
74 | 73 | ||
75 | // public AgentAssetTransactionsManager TransactionsManager | 74 | // public AgentAssetTransactionsManager TransactionsManager |
76 | // { | 75 | // { |
77 | // get { return m_transactionsManager; } | 76 | // get { return m_transactionsManager; } |
78 | // } | 77 | // } |
79 | |||
80 | protected IAvatarService m_avatarService; | ||
81 | 78 | ||
82 | public IAvatarService AvatarService | 79 | public IAvatarService AvatarService |
83 | { | 80 | { |
84 | get { return m_avatarService; } | 81 | get { return m_avatarService; } |
85 | } | 82 | } |
86 | 83 | protected IAvatarService m_avatarService; | |
87 | protected AssetCache m_assetCache; | ||
88 | 84 | ||
89 | public AssetCache AssetCache | 85 | public AssetCache AssetCache |
90 | { | 86 | { |
91 | get { return m_assetCache; } | 87 | get { return m_assetCache; } |
92 | } | 88 | } |
93 | 89 | protected AssetCache m_assetCache; | |
94 | protected NetworkServersInfo m_networkServersInfo; | 90 | |
91 | public IInterGridInventoryServices InterGridInventoryService | ||
92 | { | ||
93 | get { return m_interGridInventoryService; } | ||
94 | } | ||
95 | protected IInterGridInventoryServices m_interGridInventoryService; | ||
95 | 96 | ||
96 | public NetworkServersInfo NetworkServersInfo | 97 | public NetworkServersInfo NetworkServersInfo |
97 | { | 98 | { |
98 | get { return m_networkServersInfo; } | 99 | get { return m_networkServersInfo; } |
99 | } | 100 | } |
101 | protected NetworkServersInfo m_networkServersInfo; | ||
100 | 102 | ||
103 | /// <summary> | ||
104 | /// Constructor | ||
105 | /// </summary> | ||
106 | /// <param name="serversInfo"></param> | ||
107 | /// <param name="httpServer"></param> | ||
108 | /// <param name="assetCache"></param> | ||
109 | /// <param name="dumpAssetsToFile"></param> | ||
101 | public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, | 110 | public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, |
102 | bool dumpAssetsToFile) | 111 | bool dumpAssetsToFile) |
103 | { | 112 | { |