diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/CommunicationsManager.cs | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index d6a577f..e5abb2e 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -25,96 +25,94 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System.Text; | ||
29 | using libsecondlife; | 28 | using libsecondlife; |
30 | using libsecondlife.Packets; | ||
31 | using OpenSim.Framework.Communications.Cache; | 29 | using OpenSim.Framework.Communications.Cache; |
30 | using OpenSim.Framework.Communications.Caches; | ||
32 | using OpenSim.Framework.Data; | 31 | using OpenSim.Framework.Data; |
33 | using OpenSim.Framework.Interfaces; | 32 | using OpenSim.Framework.Interfaces; |
34 | using OpenSim.Framework.Types; | ||
35 | using OpenSim.Framework.Servers; | 33 | using OpenSim.Framework.Servers; |
36 | using OpenSim.Framework.Communications.Caches; | 34 | using OpenSim.Framework.Types; |
37 | |||
38 | 35 | ||
39 | namespace OpenSim.Framework.Communications | 36 | namespace OpenSim.Framework.Communications |
40 | { | 37 | { |
41 | |||
42 | public class CommunicationsManager | 38 | public class CommunicationsManager |
43 | { | 39 | { |
40 | private AssetCache m_assetCache; | ||
41 | private IGridServices m_gridServer; | ||
42 | private IInterRegionCommunications m_interRegion; | ||
43 | private IInventoryServices m_inventoryServer; | ||
44 | private AssetTransactionManager m_transactionsManager; | ||
45 | private UserProfileCache m_userProfiles; | ||
46 | private IUserServices m_userServer; | ||
47 | private NetworkServersInfo m_networkServersInfo; | ||
48 | |||
44 | public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache) | 49 | public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache) |
45 | { | 50 | { |
46 | this.serversInfo = serversInfo; | 51 | this.m_networkServersInfo = serversInfo; |
47 | this.m_assetCache = assetCache; | 52 | m_assetCache = assetCache; |
48 | m_userProfiles = new UserProfileCache(this); | 53 | m_userProfiles = new UserProfileCache(this); |
49 | m_transactionsManager = new AssetTransactionManager(this); | 54 | m_transactionsManager = new AssetTransactionManager(this); |
50 | } | 55 | } |
51 | 56 | ||
52 | private IUserServices m_userServer; | ||
53 | public IUserServices UserServer | 57 | public IUserServices UserServer |
54 | { | 58 | { |
55 | get { return m_userServer; } | 59 | get { return m_userServer; } |
56 | set { m_userServer = value; } | 60 | set { m_userServer = value; } |
57 | } | 61 | } |
58 | 62 | ||
59 | private IGridServices m_gridServer; | ||
60 | public IGridServices GridServer | 63 | public IGridServices GridServer |
61 | { | 64 | { |
62 | get { return m_gridServer; } | 65 | get { return m_gridServer; } |
63 | set { m_gridServer = value; } | 66 | set { m_gridServer = value; } |
64 | } | 67 | } |
65 | 68 | ||
66 | private IInventoryServices m_inventoryServer; | ||
67 | public IInventoryServices InventoryServer | 69 | public IInventoryServices InventoryServer |
68 | { | 70 | { |
69 | get { return m_inventoryServer; } | 71 | get { return m_inventoryServer; } |
70 | set { m_inventoryServer = value; } | 72 | set { m_inventoryServer = value; } |
71 | } | 73 | } |
72 | 74 | ||
73 | private IInterRegionCommunications m_interRegion; | ||
74 | public IInterRegionCommunications InterRegion | 75 | public IInterRegionCommunications InterRegion |
75 | { | 76 | { |
76 | get { return m_interRegion; } | 77 | get { return m_interRegion; } |
77 | set { m_interRegion = value; } | 78 | set { m_interRegion = value; } |
78 | } | 79 | } |
79 | 80 | ||
80 | private UserProfileCache m_userProfiles; | ||
81 | public UserProfileCache UserProfiles | 81 | public UserProfileCache UserProfiles |
82 | { | 82 | { |
83 | get { return m_userProfiles; } | 83 | get { return m_userProfiles; } |
84 | set { m_userProfiles = value; } | 84 | set { m_userProfiles = value; } |
85 | } | 85 | } |
86 | 86 | ||
87 | private AssetTransactionManager m_transactionsManager; | ||
88 | public AssetTransactionManager TransactionsManager | 87 | public AssetTransactionManager TransactionsManager |
89 | { | 88 | { |
90 | get { return m_transactionsManager; } | 89 | get { return m_transactionsManager; } |
91 | set { m_transactionsManager = value; } | 90 | set { m_transactionsManager = value; } |
92 | } | 91 | } |
93 | 92 | ||
94 | private AssetCache m_assetCache; | ||
95 | public AssetCache AssetCache | 93 | public AssetCache AssetCache |
96 | { | 94 | { |
97 | get { return m_assetCache; } | 95 | get { return m_assetCache; } |
98 | set { m_assetCache = value; } | 96 | set { m_assetCache = value; } |
99 | } | 97 | } |
100 | 98 | ||
101 | private NetworkServersInfo serversInfo; | 99 | public NetworkServersInfo NetworkServersInfo |
102 | public NetworkServersInfo ServersInfo | ||
103 | { | 100 | { |
104 | get { return serversInfo; } | 101 | get { return m_networkServersInfo; } |
105 | set { serversInfo = value; } | 102 | set { m_networkServersInfo = value; } |
106 | } | 103 | } |
107 | 104 | ||
108 | #region Packet Handlers | 105 | #region Packet Handlers |
106 | |||
109 | public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client) | 107 | public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client) |
110 | { | 108 | { |
111 | if (uuid == m_userProfiles.libraryRoot.agentID) | 109 | if (uuid == m_userProfiles.libraryRoot.agentID) |
112 | { | 110 | { |
113 | remote_client.SendNameReply(uuid , "Mr" , "OpenSim"); | 111 | remote_client.SendNameReply(uuid, "Mr", "OpenSim"); |
114 | } | 112 | } |
115 | else | 113 | else |
116 | { | 114 | { |
117 | UserProfileData profileData = this.m_userServer.GetUserProfile(uuid); | 115 | UserProfileData profileData = m_userServer.GetUserProfile(uuid); |
118 | if (profileData != null) | 116 | if (profileData != null) |
119 | { | 117 | { |
120 | LLUUID profileId = profileData.UUID; | 118 | LLUUID profileId = profileData.UUID; |
@@ -128,4 +126,4 @@ namespace OpenSim.Framework.Communications | |||
128 | 126 | ||
129 | #endregion | 127 | #endregion |
130 | } | 128 | } |
131 | } | 129 | } \ No newline at end of file |