aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs9
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs2
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs78
3 files changed, 68 insertions, 21 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 0fadb85..4ae8595 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework.Interfaces;
37using OpenSim.Framework.Types; 37using OpenSim.Framework.Types;
38using OpenSim.Framework.Utilities; 38using OpenSim.Framework.Utilities;
39 39
40namespace OpenSim.Framework.Communications.Caches 40namespace OpenSim.Framework.Communications.Cache
41{ 41{
42 public delegate void DownloadComplete(AssetCache.TextureSender sender); 42 public delegate void DownloadComplete(AssetCache.TextureSender sender);
43 43
@@ -180,7 +180,7 @@ namespace OpenSim.Framework.Communications.Caches
180 180
181 public void DeleteAsset(LLUUID assetID) 181 public void DeleteAsset(LLUUID assetID)
182 { 182 {
183 // this._assetServer.DeleteAsset(assetID); 183 // this._assetServer.DeleteAsset(assetID);
184 184
185 //Todo should delete it from memory too 185 //Todo should delete it from memory too
186 } 186 }
@@ -268,7 +268,7 @@ namespace OpenSim.Framework.Communications.Caches
268 if (this.SendingTextures.ContainsKey(sender.request.ImageInfo.FullID)) 268 if (this.SendingTextures.ContainsKey(sender.request.ImageInfo.FullID))
269 { 269 {
270 this.SendingTextures.Remove(sender.request.ImageInfo.FullID); 270 this.SendingTextures.Remove(sender.request.ImageInfo.FullID);
271 // this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID); 271 // this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID);
272 } 272 }
273 } 273 }
274 274
@@ -791,5 +791,4 @@ namespace OpenSim.Framework.Communications.Caches
791 } 791 }
792 } 792 }
793 } 793 }
794} 794} \ No newline at end of file
795
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index f9c8b47..59c6d7c 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -31,10 +31,10 @@ using System.Collections.Generic;
31using System.Text; 31using System.Text;
32using System.IO; 32using System.IO;
33using libsecondlife; 33using libsecondlife;
34using OpenSim.Framework.Communications.Cache;
34using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
35using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
36using OpenSim.Framework.Utilities; 37using OpenSim.Framework.Utilities;
37using OpenSim.Framework.Communications.Caches;
38using OpenSim.Framework.Data; 38using OpenSim.Framework.Data;
39 39
40namespace OpenSim.Region.Capabilities 40namespace OpenSim.Region.Capabilities
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 6d73af8..d6a577f 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -28,6 +28,7 @@
28using System.Text; 28using System.Text;
29using libsecondlife; 29using libsecondlife;
30using libsecondlife.Packets; 30using libsecondlife.Packets;
31using OpenSim.Framework.Communications.Cache;
31using OpenSim.Framework.Data; 32using OpenSim.Framework.Data;
32using OpenSim.Framework.Interfaces; 33using OpenSim.Framework.Interfaces;
33using OpenSim.Framework.Types; 34using OpenSim.Framework.Types;
@@ -40,33 +41,80 @@ namespace OpenSim.Framework.Communications
40 41
41 public class CommunicationsManager 42 public class CommunicationsManager
42 { 43 {
43 public IUserServices UserServer;
44 public IGridServices GridServer;
45 public IInventoryServices InventoryServer;
46 public IInterRegionCommunications InterRegion;
47 public UserProfileCache UserProfiles;
48 public AssetTransactionManager TransactionsManager;
49 public AssetCache AssetCache;
50
51 public NetworkServersInfo ServersInfo;
52 public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache) 44 public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache)
53 { 45 {
54 ServersInfo = serversInfo; 46 this.serversInfo = serversInfo;
55 this.AssetCache = assetCache; 47 this.m_assetCache = assetCache;
56 UserProfiles = new UserProfileCache(this); 48 m_userProfiles = new UserProfileCache(this);
57 TransactionsManager = new AssetTransactionManager(this); 49 m_transactionsManager = new AssetTransactionManager(this);
50 }
51
52 private IUserServices m_userServer;
53 public IUserServices UserServer
54 {
55 get { return m_userServer; }
56 set { m_userServer = value; }
57 }
58
59 private IGridServices m_gridServer;
60 public IGridServices GridServer
61 {
62 get { return m_gridServer; }
63 set { m_gridServer = value; }
64 }
65
66 private IInventoryServices m_inventoryServer;
67 public IInventoryServices InventoryServer
68 {
69 get { return m_inventoryServer; }
70 set { m_inventoryServer = value; }
71 }
72
73 private IInterRegionCommunications m_interRegion;
74 public IInterRegionCommunications InterRegion
75 {
76 get { return m_interRegion; }
77 set { m_interRegion = value; }
78 }
79
80 private UserProfileCache m_userProfiles;
81 public UserProfileCache UserProfiles
82 {
83 get { return m_userProfiles; }
84 set { m_userProfiles = value; }
85 }
86
87 private AssetTransactionManager m_transactionsManager;
88 public AssetTransactionManager TransactionsManager
89 {
90 get { return m_transactionsManager; }
91 set { m_transactionsManager = value; }
92 }
93
94 private AssetCache m_assetCache;
95 public AssetCache AssetCache
96 {
97 get { return m_assetCache; }
98 set { m_assetCache = value; }
99 }
100
101 private NetworkServersInfo serversInfo;
102 public NetworkServersInfo ServersInfo
103 {
104 get { return serversInfo; }
105 set { serversInfo = value; }
58 } 106 }
59 107
60 #region Packet Handlers 108 #region Packet Handlers
61 public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client) 109 public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)
62 { 110 {
63 if (uuid == UserProfiles.libraryRoot.agentID) 111 if (uuid == m_userProfiles.libraryRoot.agentID)
64 { 112 {
65 remote_client.SendNameReply(uuid , "Mr" , "OpenSim"); 113 remote_client.SendNameReply(uuid , "Mr" , "OpenSim");
66 } 114 }
67 else 115 else
68 { 116 {
69 UserProfileData profileData = this.UserServer.GetUserProfile(uuid); 117 UserProfileData profileData = this.m_userServer.GetUserProfile(uuid);
70 if (profileData != null) 118 if (profileData != null)
71 { 119 {
72 LLUUID profileId = profileData.UUID; 120 LLUUID profileId = profileData.UUID;