Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

author: Kitto Flora 2010-11-11 04:51:05 +0000
committer: Kitto Flora 2010-11-11 04:51:05 +0000
commit: b2aeea66e36593ccab973240bab43724f577165b (patch)
tree: 4b7bed905081a7678411f251af260e14261cc545 /OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
parent: Fix excessive forward motion and flailing while descending a slope, prevent a... (diff)
parent: Prevent teleporting to a region when the egent is banned in all parcels (diff)
download: opensim-SC_OLD-b2aeea66e36593ccab973240bab43724f577165b.zip
opensim-SC_OLD-b2aeea66e36593ccab973240bab43724f577165b.tar.gz
opensim-SC_OLD-b2aeea66e36593ccab973240bab43724f577165b.tar.bz2
opensim-SC_OLD-b2aeea66e36593ccab973240bab43724f577165b.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 626f7eb..59968a1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -615,7 +615,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            // UseCircuitCode handling
            if (packet.Type == PacketType.UseCircuitCode)
-            {                
+            {
                object[] array = new object[] { buffer, packet };
                if (m_asyncPacketHandling)
@@ -843,7 +843,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            
            m_log.DebugFormat(
                "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms", 
-                buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds);            
+                buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds);
        }
        private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber)
author	Kitto Flora	2010-11-11 04:51:05 +0000
committer	Kitto Flora	2010-11-11 04:51:05 +0000
commit	b2aeea66e36593ccab973240bab43724f577165b (patch)
tree	4b7bed905081a7678411f251af260e14261cc545 /OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
parent	Fix excessive forward motion and flailing while descending a slope, prevent a... (diff)
parent	Prevent teleporting to a region when the egent is banned in all parcels (diff)
download	opensim-SC_OLD-b2aeea66e36593ccab973240bab43724f577165b.zip opensim-SC_OLD-b2aeea66e36593ccab973240bab43724f577165b.tar.gz opensim-SC_OLD-b2aeea66e36593ccab973240bab43724f577165b.tar.bz2 opensim-SC_OLD-b2aeea66e36593ccab973240bab43724f577165b.tar.xz

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 626f7eb..59968a1 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -615,7 +615,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
615		615
616	// UseCircuitCode handling	616	// UseCircuitCode handling
617	if (packet.Type == PacketType.UseCircuitCode)	617	if (packet.Type == PacketType.UseCircuitCode)
618	{	618	{
619	object[] array = new object[] { buffer, packet };	619	object[] array = new object[] { buffer, packet };
620		620
621	if (m_asyncPacketHandling)	621	if (m_asyncPacketHandling)
@@ -843,7 +843,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
843		843
844	m_log.DebugFormat(	844	m_log.DebugFormat(
845	"[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms",	845	"[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms",
846	buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds);	846	buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds);
847	}	847	}
848		848
849	private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber)	849	private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber)