ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Handlerized ViewerEffect

Browse Source 
* Now there-is-only-client-manager
* First step towards moving Logout and ConnectionClosed out of Client and into something else (which will let us get rid of ClientView reference to ClientManager
* General posititvity, peace, love and understanding
This commit is contained in:
lbsa71
2007-09-18 12:13:44 +00:00
parent a963b3057b
commit 0bac4b430c
10 changed files with 110 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,6 @@ namespace OpenSim.Region.ClientStack
{
private ClientStackNetworkHandler _networkHandler;
private IScene _localScene;
public Dictionary<uint, IClientAPI> ClientThreads = new Dictionary<uint, IClientAPI>();
private ClientManager m_clientManager = new ClientManager();
public ClientManager ClientManager
{
@@ -66,20 +65,14 @@ namespace OpenSim.Region.ClientStack
/// </summary>
/// <param name="circuitCode"></param>
/// <param name="packet"></param>
public virtual void ClientInPacket(uint circuitCode, Packet packet)
public virtual void InPacket(uint circuitCode, Packet packet)
{
if (this.ClientThreads.ContainsKey(circuitCode))
{
ClientThreads[circuitCode].InPacket(packet);
}
m_clientManager.InPacket(circuitCode, packet);
}
public virtual void ConnectionClosed(uint circuitCode)
{
if (this.ClientThreads.ContainsKey(circuitCode))
{
ClientThreads[circuitCode].ConnectionClosed();
}
m_clientManager.ConnectionClosed(circuitCode);
}
/// <summary>
@@ -129,9 +122,9 @@ namespace OpenSim.Region.ClientStack
}
protected virtual IClientAPI CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, IClientAPI> clientThreads, IScene scene, AssetCache assetCache, PacketServer packServer, AgentCircuitManager authenSessions)
protected virtual IClientAPI CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, ClientManager clientManager, IScene scene, AssetCache assetCache, PacketServer packServer, AgentCircuitManager authenSessions)
{
return new ClientView(remoteEP, initialcirpack, clientThreads, scene, assetCache, packServer, authenSessions );
return new ClientView(remoteEP, initialcirpack, clientManager, scene, assetCache, packServer, authenSessions );
}
/// <summary>
@@ -146,15 +139,18 @@ namespace OpenSim.Region.ClientStack
public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, AgentCircuitManager authenticateSessionsClass)
{
IClientAPI newuser =
CreateNewClient(epSender, useCircuit, ClientThreads, _localScene, assetCache, this,
CreateNewClient(epSender, useCircuit, m_clientManager, _localScene, assetCache, this,
authenticateSessionsClass);
this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);
this.m_clientManager.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser);
this.m_clientManager.Add(useCircuit.CircuitCode.Code, newuser);
newuser.OnViewerEffect += m_clientManager.ViewerEffectHandler;
return true;
}
/// <summary>
///
/// </summary>