diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/PacketServer.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/PacketServer.cs | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs index 596cdbe..9d2250e 100644 --- a/OpenSim/Region/ClientStack/PacketServer.cs +++ b/OpenSim/Region/ClientStack/PacketServer.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Region.ClientStack | |||
40 | public class PacketServer | 40 | public class PacketServer |
41 | { | 41 | { |
42 | private ClientStackNetworkHandler _networkHandler; | 42 | private ClientStackNetworkHandler _networkHandler; |
43 | private IWorld _localWorld; | 43 | private IScene _localScene; |
44 | public Dictionary<uint, ClientView> ClientThreads = new Dictionary<uint, ClientView>(); | 44 | public Dictionary<uint, ClientView> ClientThreads = new Dictionary<uint, ClientView>(); |
45 | private ClientManager m_clientManager = new ClientManager(); | 45 | private ClientManager m_clientManager = new ClientManager(); |
46 | public ClientManager ClientManager | 46 | public ClientManager ClientManager |
@@ -54,11 +54,11 @@ namespace OpenSim.Region.ClientStack | |||
54 | _networkHandler.RegisterPacketServer(this); | 54 | _networkHandler.RegisterPacketServer(this); |
55 | } | 55 | } |
56 | 56 | ||
57 | public IWorld LocalWorld | 57 | public IScene LocalScene |
58 | { | 58 | { |
59 | set | 59 | set |
60 | { | 60 | { |
61 | this._localWorld = value; | 61 | this._localScene = value; |
62 | } | 62 | } |
63 | } | 63 | } |
64 | 64 | ||
@@ -122,19 +122,7 @@ namespace OpenSim.Region.ClientStack | |||
122 | 122 | ||
123 | } | 123 | } |
124 | 124 | ||
125 | /// <summary> | 125 | protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IScene world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AgentCircuitManager authenSessions) |
126 | /// | ||
127 | /// </summary> | ||
128 | /// <param name="remoteEP"></param> | ||
129 | /// <param name="initialcirpack"></param> | ||
130 | /// <param name="clientThreads"></param> | ||
131 | /// <param name="world"></param> | ||
132 | /// <param name="assetCache"></param> | ||
133 | /// <param name="packServer"></param> | ||
134 | /// <param name="inventoryCache"></param> | ||
135 | /// <param name="authenSessions"></param> | ||
136 | /// <returns></returns> | ||
137 | protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AgentCircuitManager authenSessions) | ||
138 | { | 126 | { |
139 | return new ClientView(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions ); | 127 | return new ClientView(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions ); |
140 | } | 128 | } |
@@ -151,7 +139,7 @@ namespace OpenSim.Region.ClientStack | |||
151 | public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AgentCircuitManager authenticateSessionsClass) | 139 | public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AgentCircuitManager authenticateSessionsClass) |
152 | { | 140 | { |
153 | ClientView newuser = | 141 | ClientView newuser = |
154 | CreateNewClient(epSender, useCircuit, ClientThreads, _localWorld, assetCache, this, inventoryCache, | 142 | CreateNewClient(epSender, useCircuit, ClientThreads, _localScene, assetCache, this, inventoryCache, |
155 | authenticateSessionsClass); | 143 | authenticateSessionsClass); |
156 | 144 | ||
157 | this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser); | 145 | this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser); |