aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs9
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs6
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs1
3 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 4abc0f7..20452e0 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -56,10 +56,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
56 protected IPEndPoint ServerIncoming; 56 protected IPEndPoint ServerIncoming;
57 protected byte[] RecvBuffer = new byte[4096]; 57 protected byte[] RecvBuffer = new byte[4096];
58 protected byte[] ZeroBuffer = new byte[8192]; 58 protected byte[] ZeroBuffer = new byte[8192];
59 protected IPEndPoint ipeSender;
60 59
61 /// <value> 60 /// <value>
62 /// The endpoint of a sender of a particular packet. The port is continually changed by the various socket receive methods 61 /// The endpoint of a sender of a particular packet. The port is changed by the various socket receive methods
63 /// </value> 62 /// </value>
64 protected EndPoint epSender; 63 protected EndPoint epSender;
65 64
@@ -176,8 +175,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
176 /// <param name="result"></param> 175 /// <param name="result"></param>
177 protected virtual void OnReceivedData(IAsyncResult result) 176 protected virtual void OnReceivedData(IAsyncResult result)
178 { 177 {
179 ipeSender = new IPEndPoint(listenIP, 0); 178 epSender = new IPEndPoint(listenIP, 0);
180 epSender = ipeSender;
181 Packet packet = null; 179 Packet packet = null;
182 180
183 int numBytes = 1; 181 int numBytes = 1;
@@ -418,8 +416,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
418 416
419 m_log.Info("[UDPSERVER]: UDP socket bound, getting ready to listen"); 417 m_log.Info("[UDPSERVER]: UDP socket bound, getting ready to listen");
420 418
421 ipeSender = new IPEndPoint(listenIP, 0); 419 epSender = new IPEndPoint(listenIP, 0);
422 epSender = ipeSender;
423 ReceivedData = OnReceivedData; 420 ReceivedData = OnReceivedData;
424 m_socket.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); 421 m_socket.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
425 422
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index 22a8f5a..ce7896e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -27,12 +27,13 @@
27 27
28using System.Net; 28using System.Net;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenMetaverse.Packets;
30using OpenSim.Framework; 31using OpenSim.Framework;
31using OpenSim.Framework.Communications; 32using OpenSim.Framework.Communications;
32using OpenSim.Region.ClientStack; 33using OpenSim.Region.ClientStack;
33using OpenSim.Region.ClientStack.LindenUDP; 34using OpenSim.Region.ClientStack.LindenUDP;
34 35
35namespace OpenSim.Region.ClientStack.LindenUDP.Tests 36namespace OpenSim.Region.ClientStack.LindenUDP
36{ 37{
37 /// <summary> 38 /// <summary>
38 /// This will contain basic tests for the LindenUDP client stack 39 /// This will contain basic tests for the LindenUDP client stack
@@ -47,6 +48,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
47 48
48 uint port = 666; 49 uint port = 666;
49 llUdpServer.Initialise(null, ref port, -1, false, new ClientStackUserSettings(), null, null); 50 llUdpServer.Initialise(null, ref port, -1, false, new ClientStackUserSettings(), null, null);
51
52 UseCircuitCodePacket uccp = new UseCircuitCodePacket();
53 //llUdpServer.epS
50 } 54 }
51 } 55 }
52} 56}
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 90285c2..2108c35 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -472,6 +472,7 @@ namespace OpenSim.Region.Physics.OdePlugin
472 { 472 {
473 if (g1 == IntPtr.Zero || g2 == IntPtr.Zero) 473 if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
474 return; 474 return;
475
475 // Separating static prim geometry spaces. 476 // Separating static prim geometry spaces.
476 // We'll be calling near recursivly if one 477 // We'll be calling near recursivly if one
477 // of them is a space to find all of the 478 // of them is a space to find all of the