aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs10
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs1
2 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 04518bd..a48c536 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -365,6 +365,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
365 public LLClientView(EndPoint remoteEP, IScene scene, AssetCache assetCache, LLPacketServer packServer, 365 public LLClientView(EndPoint remoteEP, IScene scene, AssetCache assetCache, LLPacketServer packServer,
366 AgentCircuitManager authenSessions, LLUUID agentId, LLUUID sessionId, uint circuitCode, EndPoint proxyEP) 366 AgentCircuitManager authenSessions, LLUUID agentId, LLUUID sessionId, uint circuitCode, EndPoint proxyEP)
367 { 367 {
368 m_log.Info("[CLIENT]: Started up new client thread to handle incoming request");
369
368 m_moneyBalance = 1000; 370 m_moneyBalance = 1000;
369 371
370 m_channelVersion = Helpers.StringToField(scene.GetSimulatorVersion()); 372 m_channelVersion = Helpers.StringToField(scene.GetSimulatorVersion());
@@ -376,9 +378,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
376 378
377 m_networkServer = packServer; 379 m_networkServer = packServer;
378 // m_inventoryCache = inventoryCache; 380 // m_inventoryCache = inventoryCache;
379 m_authenticateSessionsHandler = authenSessions; 381 m_authenticateSessionsHandler = authenSessions;
380
381 m_log.Info("[CLIENT]: Started up new client thread to handle incoming request");
382 382
383 m_agentId = agentId; 383 m_agentId = agentId;
384 m_sessionId = sessionId; 384 m_sessionId = sessionId;
@@ -399,7 +399,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
399 399
400 RegisterLocalPacketHandlers(); 400 RegisterLocalPacketHandlers();
401 401
402
403 m_clientThread = new Thread(new ThreadStart(AuthUser)); 402 m_clientThread = new Thread(new ThreadStart(AuthUser));
404 m_clientThread.Name = "ClientThread"; 403 m_clientThread.Name = "ClientThread";
405 m_clientThread.IsBackground = true; 404 m_clientThread.IsBackground = true;
@@ -677,8 +676,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
677 m_clientPingTimer = new Timer(5000); 676 m_clientPingTimer = new Timer(5000);
678 m_clientPingTimer.Elapsed += new ElapsedEventHandler(CheckClientConnectivity); 677 m_clientPingTimer.Elapsed += new ElapsedEventHandler(CheckClientConnectivity);
679 m_clientPingTimer.Enabled = true; 678 m_clientPingTimer.Enabled = true;
680 679
681 m_log.Info("[CLIENT]: Adding viewer agent to scene");
682 m_scene.AddNewClient(this, true); 680 m_scene.AddNewClient(this, true);
683 } 681 }
684 682
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 28f5a32..41a3197 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -382,6 +382,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
382 { 382 {
383 if (!(packet is UseCircuitCodePacket)) 383 if (!(packet is UseCircuitCodePacket))
384 return; 384 return;
385
385 UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet; 386 UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet;
386 lock (clientCircuits) 387 lock (clientCircuits)
387 { 388 {