diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/PacketServer.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs index a232db8..7e01adf 100644 --- a/OpenSim/Region/ClientStack/PacketServer.cs +++ b/OpenSim/Region/ClientStack/PacketServer.cs | |||
@@ -68,10 +68,11 @@ namespace OpenSim.Region.ClientStack | |||
68 | 68 | ||
69 | protected virtual IClientAPI CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, | 69 | protected virtual IClientAPI CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, |
70 | ClientManager clientManager, IScene scene, AssetCache assetCache, | 70 | ClientManager clientManager, IScene scene, AssetCache assetCache, |
71 | PacketServer packServer, AgentCircuitManager authenSessions, LLUUID agentId, LLUUID sessionId, uint circuitCode) | 71 | PacketServer packServer, AgentCircuitManager authenSessions, |
72 | LLUUID agentId, LLUUID sessionId, uint circuitCode) | ||
72 | { | 73 | { |
73 | return | 74 | return |
74 | new ClientView(remoteEP, scene, assetCache, packServer, authenSessions, agentId, sessionId, circuitCode ); | 75 | new ClientView(remoteEP, scene, assetCache, packServer, authenSessions, agentId, sessionId, circuitCode); |
75 | } | 76 | } |
76 | 77 | ||
77 | public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, | 78 | public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, |
@@ -86,7 +87,8 @@ namespace OpenSim.Region.ClientStack | |||
86 | else | 87 | else |
87 | { | 88 | { |
88 | newuser = CreateNewClient(epSender, useCircuit, m_scene.ClientManager, m_scene, assetCache, this, | 89 | newuser = CreateNewClient(epSender, useCircuit, m_scene.ClientManager, m_scene, assetCache, this, |
89 | authenticateSessionsClass, useCircuit.CircuitCode.ID, useCircuit.CircuitCode.SessionID, useCircuit.CircuitCode.Code); | 90 | authenticateSessionsClass, useCircuit.CircuitCode.ID, |
91 | useCircuit.CircuitCode.SessionID, useCircuit.CircuitCode.Code); | ||
90 | 92 | ||
91 | m_scene.ClientManager.Add(useCircuit.CircuitCode.Code, newuser); | 93 | m_scene.ClientManager.Add(useCircuit.CircuitCode.Code, newuser); |
92 | 94 | ||
@@ -123,9 +125,8 @@ namespace OpenSim.Region.ClientStack | |||
123 | /// <param name="circuitcode"></param> | 125 | /// <param name="circuitcode"></param> |
124 | public virtual void CloseCircuit(uint circuitcode) | 126 | public virtual void CloseCircuit(uint circuitcode) |
125 | { | 127 | { |
126 | |||
127 | m_networkHandler.RemoveClientCircuit(circuitcode); | 128 | m_networkHandler.RemoveClientCircuit(circuitcode); |
128 | 129 | ||
129 | //m_scene.ClientManager.CloseAllAgents(circuitcode); | 130 | //m_scene.ClientManager.CloseAllAgents(circuitcode); |
130 | } | 131 | } |
131 | 132 | ||
@@ -135,4 +136,4 @@ namespace OpenSim.Region.ClientStack | |||
135 | client.Close(false); | 136 | client.Close(false); |
136 | } | 137 | } |
137 | } | 138 | } |
138 | } | 139 | } \ No newline at end of file |