ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Encapsulated all CommunicationsManager services

Browse Source
This commit is contained in:
lbsa71
2007-09-24 05:15:13 +00:00
parent 13c1c33ed4
commit 40468f18a4
18 changed files with 225 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@@ -37,7 +37,7 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
namespace OpenSim.Framework.Communications.Caches
namespace OpenSim.Framework.Communications.Cache
{
public delegate void DownloadComplete(AssetCache.TextureSender sender);
@@ -180,7 +180,7 @@ namespace OpenSim.Framework.Communications.Caches
public void DeleteAsset(LLUUID assetID)
{
// this._assetServer.DeleteAsset(assetID);
// this._assetServer.DeleteAsset(assetID);
//Todo should delete it from memory too
}
@@ -268,7 +268,7 @@ namespace OpenSim.Framework.Communications.Caches
if (this.SendingTextures.ContainsKey(sender.request.ImageInfo.FullID))
{
this.SendingTextures.Remove(sender.request.ImageInfo.FullID);
// this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID);
// this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID);
}
}
@@ -791,5 +791,4 @@ namespace OpenSim.Framework.Communications.Caches
}
}
}
}
}

2
OpenSim/Framework/Communications/Capabilities/Caps.cs
View File

@@ -31,10 +31,10 @@ using System.Collections.Generic;
using System.Text;
using System.IO;
using libsecondlife;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
using OpenSim.Framework.Communications.Caches;
using OpenSim.Framework.Data;
namespace OpenSim.Region.Capabilities

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

@@ -28,6 +28,7 @@
using System.Text;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Data;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
@@ -40,33 +41,80 @@ namespace OpenSim.Framework.Communications
public class CommunicationsManager
{
public IUserServices UserServer;
public IGridServices GridServer;
public IInventoryServices InventoryServer;
public IInterRegionCommunications InterRegion;
public UserProfileCache UserProfiles;
public AssetTransactionManager TransactionsManager;
public AssetCache AssetCache;
public NetworkServersInfo ServersInfo;
public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache)
{
ServersInfo = serversInfo;
this.AssetCache = assetCache;
UserProfiles = new UserProfileCache(this);
TransactionsManager = new AssetTransactionManager(this);
this.serversInfo = serversInfo;
this.m_assetCache = assetCache;
m_userProfiles = new UserProfileCache(this);
m_transactionsManager = new AssetTransactionManager(this);
}
private IUserServices m_userServer;
public IUserServices UserServer
{
get { return m_userServer; }
set { m_userServer = value; }
}
private IGridServices m_gridServer;
public IGridServices GridServer
{
get { return m_gridServer; }
set { m_gridServer = value; }
}
private IInventoryServices m_inventoryServer;
public IInventoryServices InventoryServer
{
get { return m_inventoryServer; }
set { m_inventoryServer = value; }
}
private IInterRegionCommunications m_interRegion;
public IInterRegionCommunications InterRegion
{
get { return m_interRegion; }
set { m_interRegion = value; }
}
private UserProfileCache m_userProfiles;
public UserProfileCache UserProfiles
{
get { return m_userProfiles; }
set { m_userProfiles = value; }
}
private AssetTransactionManager m_transactionsManager;
public AssetTransactionManager TransactionsManager
{
get { return m_transactionsManager; }
set { m_transactionsManager = value; }
}
private AssetCache m_assetCache;
public AssetCache AssetCache
{
get { return m_assetCache; }
set { m_assetCache = value; }
}
private NetworkServersInfo serversInfo;
public NetworkServersInfo ServersInfo
{
get { return serversInfo; }
set { serversInfo = value; }
}
#region Packet Handlers
public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)
{
if (uuid == UserProfiles.libraryRoot.agentID)
if (uuid == m_userProfiles.libraryRoot.agentID)
{
remote_client.SendNameReply(uuid , "Mr" , "OpenSim");
}
else
{
UserProfileData profileData = this.UserServer.GetUserProfile(uuid);
UserProfileData profileData = this.m_userServer.GetUserProfile(uuid);
if (profileData != null)
{
LLUUID profileId = profileData.UUID;