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

* Started renaming world to Scene

Browse Source 
* Update and UpdateMovement now first stores array to avoid collection update exceptions
* Ignored some bins
This commit is contained in:
lbsa71
2007-07-26 14:55:42 +00:00
parent 74654dc735
commit 39b64564dc
20 changed files with 137 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ namespace OpenSim.Region.ClientStack
public class PacketServer
{
private ClientStackNetworkHandler _networkHandler;
private IWorld _localWorld;
private IScene _localScene;
public Dictionary<uint, ClientView> ClientThreads = new Dictionary<uint, ClientView>();
private ClientManager m_clientManager = new ClientManager();
public ClientManager ClientManager
@@ -54,11 +54,11 @@ namespace OpenSim.Region.ClientStack
_networkHandler.RegisterPacketServer(this);
}
public IWorld LocalWorld
public IScene LocalScene
{
set
{
this._localWorld = value;
this._localScene = value;
}
}
@@ -122,19 +122,7 @@ namespace OpenSim.Region.ClientStack
}
/// <summary>
///
/// </summary>
/// <param name="remoteEP"></param>
/// <param name="initialcirpack"></param>
/// <param name="clientThreads"></param>
/// <param name="world"></param>
/// <param name="assetCache"></param>
/// <param name="packServer"></param>
/// <param name="inventoryCache"></param>
/// <param name="authenSessions"></param>
/// <returns></returns>
protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AgentCircuitManager authenSessions)
protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IScene world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AgentCircuitManager authenSessions)
{
return new ClientView(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions );
}
@@ -151,7 +139,7 @@ namespace OpenSim.Region.ClientStack
public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AgentCircuitManager authenticateSessionsClass)
{
ClientView newuser =
CreateNewClient(epSender, useCircuit, ClientThreads, _localWorld, assetCache, this, inventoryCache,
CreateNewClient(epSender, useCircuit, ClientThreads, _localScene, assetCache, this, inventoryCache,
authenticateSessionsClass);
this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);