diff options
author | Justin Clarke Casey | 2008-09-07 03:22:33 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-09-07 03:22:33 +0000 |
commit | 78f831ef5220907e4d50422a5422063921062cf8 (patch) | |
tree | 6efd3ce92be0a0594dc14cfe18f888d050391702 /OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs | |
parent | * minor: just minor doc and tidy up (diff) | |
download | opensim-SC_OLD-78f831ef5220907e4d50422a5422063921062cf8.zip opensim-SC_OLD-78f831ef5220907e4d50422a5422063921062cf8.tar.gz opensim-SC_OLD-78f831ef5220907e4d50422a5422063921062cf8.tar.bz2 opensim-SC_OLD-78f831ef5220907e4d50422a5422063921062cf8.tar.xz |
* minor: Clean up of logging messages to make following the client login process easier
* documentation
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs | 42 |
1 files changed, 34 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs index 07d3c45..c36a238 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs | |||
@@ -70,17 +70,43 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
70 | m_scene.ClientManager.InPacket(circuitCode, packet); | 70 | m_scene.ClientManager.InPacket(circuitCode, packet); |
71 | } | 71 | } |
72 | 72 | ||
73 | protected virtual IClientAPI CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, | 73 | /// <summary> |
74 | ClientManager clientManager, IScene scene, AssetCache assetCache, | 74 | /// Create a new client circuit |
75 | LLPacketServer packServer, AgentCircuitManager authenSessions, | 75 | /// </summary> |
76 | UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP) | 76 | /// <param name="remoteEP"></param> |
77 | /// <param name="initialcirpack"></param> | ||
78 | /// <param name="clientManager"></param> | ||
79 | /// <param name="scene"></param> | ||
80 | /// <param name="assetCache"></param> | ||
81 | /// <param name="packServer"></param> | ||
82 | /// <param name="authenSessions"></param> | ||
83 | /// <param name="agentId"></param> | ||
84 | /// <param name="sessionId"></param> | ||
85 | /// <param name="circuitCode"></param> | ||
86 | /// <param name="proxyEP"></param> | ||
87 | /// <returns></returns> | ||
88 | protected virtual IClientAPI CreateNewCircuit(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, | ||
89 | ClientManager clientManager, IScene scene, AssetCache assetCache, | ||
90 | LLPacketServer packServer, AgentCircuitManager authenSessions, | ||
91 | UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP) | ||
77 | { | 92 | { |
78 | return | 93 | return |
79 | new LLClientView(remoteEP, scene, assetCache, packServer, authenSessions, agentId, sessionId, circuitCode, proxyEP); | 94 | new LLClientView(remoteEP, scene, assetCache, packServer, authenSessions, agentId, sessionId, circuitCode, proxyEP); |
80 | } | 95 | } |
81 | 96 | ||
97 | /// <summary> | ||
98 | /// Add a new client circuit | ||
99 | /// </summary> | ||
100 | /// <param name="epSender"></param> | ||
101 | /// <param name="useCircuit"></param> | ||
102 | /// <param name="assetCache"></param> | ||
103 | /// <param name="circuitManager"></param> | ||
104 | /// <param name="proxyEP"></param> | ||
105 | /// <returns> | ||
106 | /// true if a new circuit was created, false if a circuit with the given circuit code already existed | ||
107 | /// </returns> | ||
82 | public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, | 108 | public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, |
83 | AgentCircuitManager authenticateSessionsClass, EndPoint proxyEP) | 109 | AgentCircuitManager circuitManager, EndPoint proxyEP) |
84 | { | 110 | { |
85 | IClientAPI newuser; | 111 | IClientAPI newuser; |
86 | 112 | ||
@@ -90,9 +116,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
90 | } | 116 | } |
91 | else | 117 | else |
92 | { | 118 | { |
93 | newuser = CreateNewClient(epSender, useCircuit, m_scene.ClientManager, m_scene, assetCache, this, | 119 | newuser = CreateNewCircuit(epSender, useCircuit, m_scene.ClientManager, m_scene, assetCache, this, |
94 | authenticateSessionsClass, useCircuit.CircuitCode.ID, | 120 | circuitManager, useCircuit.CircuitCode.ID, |
95 | useCircuit.CircuitCode.SessionID, useCircuit.CircuitCode.Code, proxyEP); | 121 | useCircuit.CircuitCode.SessionID, useCircuit.CircuitCode.Code, proxyEP); |
96 | 122 | ||
97 | m_scene.ClientManager.Add(useCircuit.CircuitCode.Code, newuser); | 123 | m_scene.ClientManager.Add(useCircuit.CircuitCode.Code, newuser); |
98 | 124 | ||