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

* Three more warnings are a-gone.

0.6.0-stable
Adam Frisby 2008-03-05 21:56:14 +00:00
parent 4d9ed39444
commit 810d2126ea
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
OpenSim/Region/ClientStack/UDPServer.cs
View File

@ -364,33 +364,28 @@ namespace OpenSim.Region.ClientStack
public void ServerListener() public void ServerListener()
{ {
uint newPort = listenPort; uint newPort = listenPort;
for (uint i = 0; i < 20; i++) m_log.Info("[SERVER]: Opening UDP socket on " + listenIP.ToString() + " " + newPort + ".");// Allow alternate ports: " + Allow_Alternate_Port.ToString());
try
{ {
newPort = listenPort + i; ServerIncoming = new IPEndPoint(listenIP, (int)newPort);
m_log.Info("[SERVER]: Opening UDP socket on " + listenIP.ToString() + " " + newPort + ".");// Allow alternate ports: " + Allow_Alternate_Port.ToString()); Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
try Server.Bind(ServerIncoming);
{ listenPort = newPort;
ServerIncoming = new IPEndPoint(listenIP, (int) newPort); }
Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); catch (Exception ex)
Server.Bind(ServerIncoming); {
listenPort = newPort; // We are not looking for alternate ports?
break; //if (!Allow_Alternate_Port)
} throw (ex);
catch (Exception ex)
{
// We are not looking for alternate ports?
//if (!Allow_Alternate_Port)
throw (ex);
// We are looking for alternate ports! // We are looking for alternate ports!
//m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next."); //m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next.");
}
} }
m_log.Info("[SERVER]: UDP socket bound, getting ready to listen"); m_log.Info("[SERVER]: UDP socket bound, getting ready to listen");
ipeSender = new IPEndPoint(listenIP, 0); ipeSender = new IPEndPoint(listenIP, 0);
epSender = (EndPoint) ipeSender; epSender = (EndPoint)ipeSender;
ReceivedData = new AsyncCallback(OnReceivedData); ReceivedData = new AsyncCallback(OnReceivedData);
Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);

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

@ -103,11 +103,8 @@ namespace OpenSim.Region.Physics.OdePlugin
private const uint m_regionHeight = Constants.RegionSize; private const uint m_regionHeight = Constants.RegionSize;
private static float ODE_STEPSIZE = 0.020f; private static float ODE_STEPSIZE = 0.020f;
private static bool RENDER_FLAG = false;
private static float metersInSpace = 29.9f; private static float metersInSpace = 29.9f;
private int interpenetrations_before_disable = 35;
private IntPtr contactgroup; private IntPtr contactgroup;
private IntPtr LandGeom = (IntPtr) 0; private IntPtr LandGeom = (IntPtr) 0;
private float[] _heightmap; private float[] _heightmap;