diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 5e22e2d..b721fa3 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -376,6 +376,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
376 | 376 | ||
377 | /* METHODS */ | 377 | /* METHODS */ |
378 | 378 | ||
379 | /// <summary> | ||
380 | /// Constructor | ||
381 | /// </summary> | ||
382 | /// <param name="remoteEP"></param> | ||
383 | /// <param name="scene"></param> | ||
384 | /// <param name="assetCache"></param> | ||
385 | /// <param name="packServer"></param> | ||
386 | /// <param name="authenSessions"></param> | ||
387 | /// <param name="agentId"></param> | ||
388 | /// <param name="sessionId"></param> | ||
389 | /// <param name="circuitCode"></param> | ||
390 | /// <param name="proxyEP"></param> | ||
379 | public LLClientView(EndPoint remoteEP, IScene scene, AssetCache assetCache, LLPacketServer packServer, | 391 | public LLClientView(EndPoint remoteEP, IScene scene, AssetCache assetCache, LLPacketServer packServer, |
380 | AgentCircuitManager authenSessions, UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP) | 392 | AgentCircuitManager authenSessions, UUID agentId, UUID sessionId, uint circuitCode, EndPoint proxyEP) |
381 | { | 393 | { |
@@ -417,7 +429,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
417 | m_clientThread.Start(); | 429 | m_clientThread.Start(); |
418 | ThreadTracker.Add(m_clientThread); | 430 | ThreadTracker.Add(m_clientThread); |
419 | 431 | ||
420 | m_log.Info("[CLIENT]: Started up new thread to handle client UDP session"); | 432 | m_log.DebugFormat("[CLIENT]: Started new UDP session thread for agent {0}, circuit {1}", agentId, circuitCode); |
421 | } | 433 | } |
422 | 434 | ||
423 | public void SetDebug(int newDebug) | 435 | public void SetDebug(int newDebug) |
@@ -634,7 +646,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
634 | 646 | ||
635 | protected virtual void ClientLoop() | 647 | protected virtual void ClientLoop() |
636 | { | 648 | { |
637 | m_log.Info("[CLIENT]: Entered loop"); | 649 | m_log.Info("[CLIENT]: Entered main packet processing loop"); |
650 | |||
638 | while (true) | 651 | while (true) |
639 | { | 652 | { |
640 | LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue(); | 653 | LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue(); |
@@ -729,7 +742,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
729 | /// </summary> | 742 | /// </summary> |
730 | protected virtual void AuthUser() | 743 | protected virtual void AuthUser() |
731 | { | 744 | { |
732 | |||
733 | //tell this thread we are using the culture set up for the sim (currently hardcoded to en_US) | 745 | //tell this thread we are using the culture set up for the sim (currently hardcoded to en_US) |
734 | //otherwise it will override this and use the system default | 746 | //otherwise it will override this and use the system default |
735 | Culture.SetCurrentCulture(); | 747 | Culture.SetCurrentCulture(); |
@@ -738,8 +750,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
738 | { | 750 | { |
739 | // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(m_cirpack.m_circuitCode.m_sessionId, m_cirpack.m_circuitCode.ID, m_cirpack.m_circuitCode.Code); | 751 | // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(m_cirpack.m_circuitCode.m_sessionId, m_cirpack.m_circuitCode.ID, m_cirpack.m_circuitCode.Code); |
740 | AuthenticateResponse sessionInfo = | 752 | AuthenticateResponse sessionInfo = |
741 | m_authenticateSessionsHandler.AuthenticateSession(m_sessionId, m_agentId, | 753 | m_authenticateSessionsHandler.AuthenticateSession(m_sessionId, m_agentId, m_circuitCode); |
742 | m_circuitCode); | 754 | |
743 | if (!sessionInfo.Authorised) | 755 | if (!sessionInfo.Authorised) |
744 | { | 756 | { |
745 | //session/circuit not authorised | 757 | //session/circuit not authorised |