aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-08 11:04:24 +0000
committerMelanie Thielker2008-08-08 11:04:24 +0000
commiteaff580abe080add12d294f20c11dd5efdbed288 (patch)
tree5fc382171e3c8d836db774ab8bb99272cd1af790 /OpenSim/Region
parent* All CheckRegion within an instance would use the same, global, bool for 'Av... (diff)
downloadopensim-SC_OLD-eaff580abe080add12d294f20c11dd5efdbed288.zip
opensim-SC_OLD-eaff580abe080add12d294f20c11dd5efdbed288.tar.gz
opensim-SC_OLD-eaff580abe080add12d294f20c11dd5efdbed288.tar.bz2
opensim-SC_OLD-eaff580abe080add12d294f20c11dd5efdbed288.tar.xz
Patch #9160
Refactor proxy encode/decode methods out of the PacketPool into their own class.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 41a3197..b08b59d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -259,7 +259,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
259 epProxy = epSender; 259 epProxy = epSender;
260 if (proxyPortOffset != 0) 260 if (proxyPortOffset != 0)
261 { 261 {
262 epSender = PacketPool.DecodeProxyMessage(RecvBuffer, ref numBytes); 262 epSender = ProxyCodec.DecodeProxyMessage(RecvBuffer, ref numBytes);
263 } 263 }
264 264
265 int packetEnd = numBytes - 1; 265 int packetEnd = numBytes - 1;
@@ -463,7 +463,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
463 if (proxyPortOffset != 0) 463 if (proxyPortOffset != 0)
464 { 464 {
465 //MainLog.Instance.Verbose("UDPSERVER", "SendPacketTo proxy " + proxyCircuits[circuitcode].ToString() + ": client " + sendto.ToString()); 465 //MainLog.Instance.Verbose("UDPSERVER", "SendPacketTo proxy " + proxyCircuits[circuitcode].ToString() + ": client " + sendto.ToString());
466 PacketPool.EncodeProxyMessage(buffer, ref size, sendto); 466 ProxyCodec.EncodeProxyMessage(buffer, ref size, sendto);
467 m_socket.SendTo(buffer, size, flags, proxyCircuits[circuitcode]); 467 m_socket.SendTo(buffer, size, flags, proxyCircuits[circuitcode]);
468 } 468 }
469 else 469 else