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

* Stop passing in unnecessary pameters to CreateNewCircuit

0.6.0-stable
Justin Clarke Casey 2008-10-24 21:34:18 +00:00
parent dc6724ddde
commit 7b224677c1
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
View File

@ -76,21 +76,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// Create a new client circuit /// Create a new client circuit
/// </summary> /// </summary>
/// <param name="remoteEP"></param> /// <param name="remoteEP"></param>
/// <param name="initialcirpack"></param>
/// <param name="clientManager"></param>
/// <param name="scene"></param> /// <param name="scene"></param>
/// <param name="assetCache"></param> /// <param name="assetCache"></param>
/// <param name="packServer"></param> /// <param name="packServer"></param>
/// <param name="authenSessions"></param> /// <param name="sessionInfo"></param>
/// <param name="agentId"></param> /// <param name="agentId"></param>
/// <param name="sessionId"></param> /// <param name="sessionId"></param>
/// <param name="circuitCode"></param> /// <param name="circuitCode"></param>
/// <param name="proxyEP"></param> /// <param name="proxyEP"></param>
/// <returns></returns> /// <returns></returns>
protected virtual IClientAPI CreateNewCircuit(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, protected virtual IClientAPI CreateNewCircuit(
ClientManager clientManager, IScene scene, AssetCache assetCache, EndPoint remoteEP, IScene scene, AssetCache assetCache,
LLPacketServer packServer, AuthenticateResponse sessionInfo, LLPacketServer packServer, AuthenticateResponse sessionInfo,
UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP) UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP)
{ {
return return
new LLClientView( new LLClientView(
@ -99,10 +97,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
/// <summary> /// <summary>
/// Check whether a given client is authorized to connect /// Check whether a given client is authorized to connect.
/// </summary> /// </summary>
/// <param name="useCircuit"></param> /// <param name="useCircuit"></param>
/// <param name="circuitManager"></param> /// <param name="circuitManager"></param>
/// <param name="sessionInfo"></param>
/// <returns></returns> /// <returns></returns>
public virtual bool IsClientAuthorized( public virtual bool IsClientAuthorized(
UseCircuitCodePacket useCircuit, AgentCircuitManager circuitManager, out AuthenticateResponse sessionInfo) UseCircuitCodePacket useCircuit, AgentCircuitManager circuitManager, out AuthenticateResponse sessionInfo)
@ -120,7 +119,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
/// <summary> /// <summary>
/// Add a new client circuit /// Add a new client circuit. We assume that is has already passed an authorization check
/// </summary> /// </summary>
/// <param name="epSender"></param> /// <param name="epSender"></param>
/// <param name="useCircuit"></param> /// <param name="useCircuit"></param>
@ -150,8 +149,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
newuser newuser
= CreateNewCircuit( = CreateNewCircuit(
epSender, useCircuit, m_scene.ClientManager, m_scene, assetCache, this, sessionInfo, epSender, m_scene, assetCache, this, sessionInfo, agentId, sessionId, circuitCode, proxyEP);
agentId, sessionId, circuitCode, proxyEP);
m_scene.ClientManager.Add(circuitCode, newuser); m_scene.ClientManager.Add(circuitCode, newuser);
@ -165,7 +163,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void LogoutHandler(IClientAPI client) public void LogoutHandler(IClientAPI client)
{ {
client.SendLogoutPacket(); client.SendLogoutPacket();
CloseClient(client); CloseClient(client);
} }