OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* minor: get rid of pointless ipeSender

0.6.0-stable
Justin Clarke Casey 2008-10-16 19:50:12 +00:00
parent a29d8b9abb
commit 82b7374ed2
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -56,10 +56,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
protected IPEndPoint ServerIncoming; protected IPEndPoint ServerIncoming;
protected byte[] RecvBuffer = new byte[4096]; protected byte[] RecvBuffer = new byte[4096];
protected byte[] ZeroBuffer = new byte[8192]; protected byte[] ZeroBuffer = new byte[8192];
protected IPEndPoint ipeSender;
/// <value> /// <value>
/// The endpoint of a sender of a particular packet. The port is continually changed by the various socket receive methods /// The endpoint of a sender of a particular packet. The port is changed by the various socket receive methods
/// </value> /// </value>
protected EndPoint epSender; protected EndPoint epSender;
@ -176,8 +175,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <param name="result"></param> /// <param name="result"></param>
protected virtual void OnReceivedData(IAsyncResult result) protected virtual void OnReceivedData(IAsyncResult result)
{ {
ipeSender = new IPEndPoint(listenIP, 0); epSender = new IPEndPoint(listenIP, 0);
epSender = ipeSender;
Packet packet = null; Packet packet = null;
int numBytes = 1; int numBytes = 1;
@ -418,8 +416,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_log.Info("[UDPSERVER]: UDP socket bound, getting ready to listen"); m_log.Info("[UDPSERVER]: UDP socket bound, getting ready to listen");
ipeSender = new IPEndPoint(listenIP, 0); epSender = new IPEndPoint(listenIP, 0);
epSender = ipeSender;
ReceivedData = OnReceivedData; ReceivedData = OnReceivedData;
m_socket.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); m_socket.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);

6
OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
View File

@ -27,12 +27,13 @@
using System.Net; using System.Net;
using NUnit.Framework; using NUnit.Framework;
using OpenMetaverse.Packets;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Region.ClientStack; using OpenSim.Region.ClientStack;
using OpenSim.Region.ClientStack.LindenUDP; using OpenSim.Region.ClientStack.LindenUDP;
namespace OpenSim.Region.ClientStack.LindenUDP.Tests namespace OpenSim.Region.ClientStack.LindenUDP
{ {
/// <summary> /// <summary>
/// This will contain basic tests for the LindenUDP client stack /// This will contain basic tests for the LindenUDP client stack
@ -47,6 +48,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
uint port = 666; uint port = 666;
llUdpServer.Initialise(null, ref port, -1, false, new ClientStackUserSettings(), null, null); llUdpServer.Initialise(null, ref port, -1, false, new ClientStackUserSettings(), null, null);
UseCircuitCodePacket uccp = new UseCircuitCodePacket();
//llUdpServer.epS
} }
} }
} }

1
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -472,6 +472,7 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
if (g1 == IntPtr.Zero || g2 == IntPtr.Zero) if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
return; return;
// Separating static prim geometry spaces. // Separating static prim geometry spaces.
// We'll be calling near recursivly if one // We'll be calling near recursivly if one
// of them is a space to find all of the // of them is a space to find all of the

1
prebuild.xml
View File

@ -991,6 +991,7 @@
<ReferencePath>../../../../../bin/</ReferencePath> <ReferencePath>../../../../../bin/</ReferencePath>
<Reference name="System"/> <Reference name="System"/>
<Reference name="OpenMetaverse.dll"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Communications"/> <Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Region.ClientStack"/> <Reference name="OpenSim.Region.ClientStack"/>