aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-07-12 23:48:42 +0100
committerJustin Clark-Casey (justincc)2012-07-12 23:48:42 +0100
commitd6f54b25cd8e3d7a465e9875d2e00dd414a1b019 (patch)
treef8f00db32c2b56054fe29953b5ed2ff44c2b6a63 /OpenSim/Region/ClientStack
parentRemove IClientIPEndpoint client interface for now. (diff)
downloadopensim-SC_OLD-d6f54b25cd8e3d7a465e9875d2e00dd414a1b019.zip
opensim-SC_OLD-d6f54b25cd8e3d7a465e9875d2e00dd414a1b019.tar.gz
opensim-SC_OLD-d6f54b25cd8e3d7a465e9875d2e00dd414a1b019.tar.bz2
opensim-SC_OLD-d6f54b25cd8e3d7a465e9875d2e00dd414a1b019.tar.xz
Stop redundantly passing in the endpoint to the LLClientView constructor.
This can always be retrieved via the LLUDPClient and is so done in various places already.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs5
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs2
2 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index bc5315b..73cdec3 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -357,7 +357,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
357 protected string m_lastName; 357 protected string m_lastName;
358 protected Thread m_clientThread; 358 protected Thread m_clientThread;
359 protected Vector3 m_startpos; 359 protected Vector3 m_startpos;
360 protected EndPoint m_userEndPoint;
361 protected UUID m_activeGroupID; 360 protected UUID m_activeGroupID;
362 protected string m_activeGroupName = String.Empty; 361 protected string m_activeGroupName = String.Empty;
363 protected ulong m_activeGroupPowers; 362 protected ulong m_activeGroupPowers;
@@ -442,7 +441,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
442 /// <summary> 441 /// <summary>
443 /// Constructor 442 /// Constructor
444 /// </summary> 443 /// </summary>
445 public LLClientView(EndPoint remoteEP, Scene scene, LLUDPServer udpServer, LLUDPClient udpClient, AuthenticateResponse sessionInfo, 444 public LLClientView(Scene scene, LLUDPServer udpServer, LLUDPClient udpClient, AuthenticateResponse sessionInfo,
446 UUID agentId, UUID sessionId, uint circuitCode) 445 UUID agentId, UUID sessionId, uint circuitCode)
447 { 446 {
448// DebugPacketLevel = 1; 447// DebugPacketLevel = 1;
@@ -466,7 +465,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
466 m_sessionId = sessionId; 465 m_sessionId = sessionId;
467 m_secureSessionId = sessionInfo.LoginInfo.SecureSession; 466 m_secureSessionId = sessionInfo.LoginInfo.SecureSession;
468 m_circuitCode = circuitCode; 467 m_circuitCode = circuitCode;
469 m_userEndPoint = remoteEP;
470 m_firstName = sessionInfo.LoginInfo.First; 468 m_firstName = sessionInfo.LoginInfo.First;
471 m_lastName = sessionInfo.LoginInfo.Last; 469 m_lastName = sessionInfo.LoginInfo.Last;
472 m_startpos = sessionInfo.LoginInfo.StartPos; 470 m_startpos = sessionInfo.LoginInfo.StartPos;
@@ -11832,7 +11830,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11832 { 11830 {
11833 ClientInfo info = m_udpClient.GetClientInfo(); 11831 ClientInfo info = m_udpClient.GetClientInfo();
11834 11832
11835 info.userEP = m_userEndPoint;
11836 info.proxyEP = null; 11833 info.proxyEP = null;
11837 info.agentcircuit = RequestClientInfo(); 11834 info.agentcircuit = RequestClientInfo();
11838 11835
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 468d524..097f109 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1103,7 +1103,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1103 { 1103 {
1104 LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, m_throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO); 1104 LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, m_throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO);
1105 1105
1106 client = new LLClientView(remoteEndPoint, m_scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode); 1106 client = new LLClientView(m_scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode);
1107 client.OnLogout += LogoutHandler; 1107 client.OnLogout += LogoutHandler;
1108 1108
1109 ((LLClientView)client).DisableFacelights = m_disableFacelights; 1109 ((LLClientView)client).DisableFacelights = m_disableFacelights;