aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2011-02-09 17:45:19 -0800
committerDiva Canto2011-02-09 17:45:19 -0800
commit21715396fa0d87bd4936bd37151487346794806d (patch)
treeb6000ac21876b191a765880dc2f3a27cf84e9425 /OpenSim
parentComment instrumentation out. Not needed anymore. Left in comments, in case it... (diff)
downloadopensim-SC_OLD-21715396fa0d87bd4936bd37151487346794806d.zip
opensim-SC_OLD-21715396fa0d87bd4936bd37151487346794806d.tar.gz
opensim-SC_OLD-21715396fa0d87bd4936bd37151487346794806d.tar.bz2
opensim-SC_OLD-21715396fa0d87bd4936bd37151487346794806d.tar.xz
Put the Ack of UseCircuitCode back to where it used to be. Some ppl are reporting login issues.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs11
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 207d213..584c577 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -854,14 +854,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
854 854
855 IPEndPoint remoteEndPoint = (IPEndPoint)buffer.RemoteEndPoint; 855 IPEndPoint remoteEndPoint = (IPEndPoint)buffer.RemoteEndPoint;
856 856
857 // Acknowledge the UseCircuitCode packet immediately, even before processing further
858 // This is so that the client doesn't send another one
859 SendAckImmediate(remoteEndPoint, packet.Header.Sequence);
860
861 // Begin the process of adding the client to the simulator 857 // Begin the process of adding the client to the simulator
862 AddNewClient((UseCircuitCodePacket)packet, remoteEndPoint); 858 AddNewClient((UseCircuitCodePacket)packet, remoteEndPoint);
863 859
864// m_log.DebugFormat( 860 // Send ack
861 SendAckImmediate(remoteEndPoint, packet.Header.Sequence);
862
863 // m_log.DebugFormat(
865// "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms", 864// "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms",
866// buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds); 865// buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds);
867 } 866 }