aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-24 21:34:18 +0000
committerJustin Clarke Casey2008-10-24 21:34:18 +0000
commit7b224677c1707b275300eb0e302c003e1185ff30 (patch)
treed61915d4310299be186d8f05f81c4eb850f740ef
parent* minor: Remove now unused startpos method (diff)
downloadopensim-SC_OLD-7b224677c1707b275300eb0e302c003e1185ff30.zip
opensim-SC_OLD-7b224677c1707b275300eb0e302c003e1185ff30.tar.gz
opensim-SC_OLD-7b224677c1707b275300eb0e302c003e1185ff30.tar.bz2
opensim-SC_OLD-7b224677c1707b275300eb0e302c003e1185ff30.tar.xz
* Stop passing in unnecessary pameters to CreateNewCircuit
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs21
1 files changed, 9 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
index e3a02bc..8d9c8b2 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
@@ -76,21 +76,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
76 /// Create a new client circuit 76 /// Create a new client circuit
77 /// </summary> 77 /// </summary>
78 /// <param name="remoteEP"></param> 78 /// <param name="remoteEP"></param>
79 /// <param name="initialcirpack"></param>
80 /// <param name="clientManager"></param>
81 /// <param name="scene"></param> 79 /// <param name="scene"></param>
82 /// <param name="assetCache"></param> 80 /// <param name="assetCache"></param>
83 /// <param name="packServer"></param> 81 /// <param name="packServer"></param>
84 /// <param name="authenSessions"></param> 82 /// <param name="sessionInfo"></param>
85 /// <param name="agentId"></param> 83 /// <param name="agentId"></param>
86 /// <param name="sessionId"></param> 84 /// <param name="sessionId"></param>
87 /// <param name="circuitCode"></param> 85 /// <param name="circuitCode"></param>
88 /// <param name="proxyEP"></param> 86 /// <param name="proxyEP"></param>
89 /// <returns></returns> 87 /// <returns></returns>
90 protected virtual IClientAPI CreateNewCircuit(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, 88 protected virtual IClientAPI CreateNewCircuit(
91 ClientManager clientManager, IScene scene, AssetCache assetCache, 89 EndPoint remoteEP, IScene scene, AssetCache assetCache,
92 LLPacketServer packServer, AuthenticateResponse sessionInfo, 90 LLPacketServer packServer, AuthenticateResponse sessionInfo,
93 UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP) 91 UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP)
94 { 92 {
95 return 93 return
96 new LLClientView( 94 new LLClientView(
@@ -99,10 +97,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
99 } 97 }
100 98
101 /// <summary> 99 /// <summary>
102 /// Check whether a given client is authorized to connect 100 /// Check whether a given client is authorized to connect.
103 /// </summary> 101 /// </summary>
104 /// <param name="useCircuit"></param> 102 /// <param name="useCircuit"></param>
105 /// <param name="circuitManager"></param> 103 /// <param name="circuitManager"></param>
104 /// <param name="sessionInfo"></param>
106 /// <returns></returns> 105 /// <returns></returns>
107 public virtual bool IsClientAuthorized( 106 public virtual bool IsClientAuthorized(
108 UseCircuitCodePacket useCircuit, AgentCircuitManager circuitManager, out AuthenticateResponse sessionInfo) 107 UseCircuitCodePacket useCircuit, AgentCircuitManager circuitManager, out AuthenticateResponse sessionInfo)
@@ -120,7 +119,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
120 } 119 }
121 120
122 /// <summary> 121 /// <summary>
123 /// Add a new client circuit 122 /// Add a new client circuit. We assume that is has already passed an authorization check
124 /// </summary> 123 /// </summary>
125 /// <param name="epSender"></param> 124 /// <param name="epSender"></param>
126 /// <param name="useCircuit"></param> 125 /// <param name="useCircuit"></param>
@@ -150,8 +149,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
150 149
151 newuser 150 newuser
152 = CreateNewCircuit( 151 = CreateNewCircuit(
153 epSender, useCircuit, m_scene.ClientManager, m_scene, assetCache, this, sessionInfo, 152 epSender, m_scene, assetCache, this, sessionInfo, agentId, sessionId, circuitCode, proxyEP);
154 agentId, sessionId, circuitCode, proxyEP);
155 153
156 m_scene.ClientManager.Add(circuitCode, newuser); 154 m_scene.ClientManager.Add(circuitCode, newuser);
157 155
@@ -165,7 +163,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
165 public void LogoutHandler(IClientAPI client) 163 public void LogoutHandler(IClientAPI client)
166 { 164 {
167 client.SendLogoutPacket(); 165 client.SendLogoutPacket();
168
169 CloseClient(client); 166 CloseClient(client);
170 } 167 }
171 168