OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Encapsulated all CommunicationsManager services

afrisby
lbsa71 2007-09-24 05:15:13 +00:00
parent 13c1c33ed4
commit 40468f18a4
18 changed files with 225 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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);
@ -792,4 +792,3 @@ 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;

3
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -31,6 +31,7 @@ using System.Collections.Generic;
using System.IO;
using System.Text;
using Nini.Config;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Communications.Caches;
using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
@ -270,7 +271,7 @@ namespace OpenSim
}
assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
m_assetCache = new AssetCache(assetServer);
// m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
// m_assetCache = new assetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
}
protected override LogBase CreateLog()

3
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -34,13 +34,12 @@ using System.Timers;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
using OpenSim.Framework.Communications.Caches;
using Timer = System.Timers.Timer;
namespace OpenSim.Region.ClientStack

2
OpenSim/Region/ClientStack/PacketServer.cs
View File

@ -30,9 +30,9 @@ using System.Net;
using System.Net.Sockets;
using libsecondlife.Packets;
using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Types;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Communications.Caches;
using libsecondlife;
namespace OpenSim.Region.ClientStack

2
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@ -29,6 +29,7 @@ using System;
using System.Collections.Generic;
using System.Net;
using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Console;
using OpenSim.Framework.Data;
using OpenSim.Framework.Interfaces;
@ -39,7 +40,6 @@ using OpenSim.Region.Environment;
using libsecondlife;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Caches;
namespace OpenSim.Region.ClientStack
{

2
OpenSim/Region/ClientStack/UDPServer.cs
View File

@ -31,10 +31,10 @@ using System.Net;
using System.Net.Sockets;
using libsecondlife.Packets;
using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Types;
using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Communications.Caches;
namespace OpenSim.Region.ClientStack
{

2
OpenSim/Region/Communications/Local/CommunicationsLocal.cs
View File

@ -27,9 +27,9 @@
*/
using System;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Types;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications.Caches;
using OpenSim.Framework.Console;
using OpenSim.Framework.Utilities;
using OpenSim.Framework.Data;

2
OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
View File

@ -1,7 +1,7 @@
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Types;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications.Caches;
namespace OpenSim.Region.Communications.OGS1

2
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -320,7 +320,7 @@ namespace OpenSim.Region.Communications.OGS1
return new XmlRpcResponse();
}
#region InterRegion Comms
#region m_interRegion Comms
/// <summary>
///
/// </summary>

2
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -35,7 +35,7 @@ using Axiom.Math;
using libsecondlife;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Caches;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Servers;

2
OpenSim/Region/Environment/Scenes/SceneBase.cs
View File

@ -28,7 +28,7 @@
using System;
using System.Collections.Generic;
using libsecondlife;
using OpenSim.Framework.Communications.Caches;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;

2
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -80,7 +80,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
public LLVector3 AbsolutePosition
public override LLVector3 AbsolutePosition
{
get { return m_rootPart.GroupPosition; }
set

4
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -138,7 +138,7 @@ namespace OpenSim.Region.Environment.Scenes
get { return m_controllingClient; }
}
public LLVector3 AbsolutePosition
public override LLVector3 AbsolutePosition
{
get
{
@ -172,7 +172,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
public LLVector3 Velocity
public override LLVector3 Velocity
{
get
{

3
OpenSim/Region/Examples/SimpleApp/MyWorld.cs
View File

@ -2,6 +2,7 @@ using System.Collections.Generic;
using libsecondlife;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Types;
@ -9,8 +10,6 @@ using OpenSim.Framework.Types;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Terrain;
using OpenSim.Region.Environment;
using OpenSim.Framework.Communications.Caches;
using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
namespace SimpleApp

1
OpenSim/Region/Examples/SimpleApp/Program.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.Net;
using libsecondlife;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Communications.Caches;
using OpenSim.Framework.Console;
using OpenSim.Framework.Types;