2 files changed, 15 insertions, 23 deletions

diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 10a51e5..395037f 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -364,33 +364,28 @@ namespace OpenSim.Region.ClientStack
         public void ServerListener()
         {
             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;
-                m_log.Info("[SERVER]: Opening UDP socket on " + listenIP.ToString() + " " + newPort + ".");// Allow alternate ports: " + Allow_Alternate_Port.ToString());
-                try
-                {
-                    ServerIncoming = new IPEndPoint(listenIP, (int) newPort);
-                    Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
-                    Server.Bind(ServerIncoming);
-                    listenPort = newPort;
-                    break;
-                }
-                catch (Exception ex)
-                {
-                    // We are not looking for alternate ports?
-                    //if (!Allow_Alternate_Port)
-                        throw (ex);
+                ServerIncoming = new IPEndPoint(listenIP, (int)newPort);
+                Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+                Server.Bind(ServerIncoming);
+                listenPort = newPort;
+            }
+            catch (Exception ex)
+            {
+                // We are not looking for alternate ports?
+                //if (!Allow_Alternate_Port)
+                throw (ex);
 
-                    // We are looking for alternate ports!
-                    //m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next.");
-                }
+                // 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 bound, getting ready to listen");
 
             ipeSender = new IPEndPoint(listenIP, 0);
-            epSender = (EndPoint) ipeSender;
+            epSender = (EndPoint)ipeSender;
             ReceivedData = new AsyncCallback(OnReceivedData);
             Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
 
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 563bf44..266cb3d 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -103,11 +103,8 @@ namespace OpenSim.Region.Physics.OdePlugin
         private const uint m_regionHeight = Constants.RegionSize;
 
         private static float ODE_STEPSIZE = 0.020f;
-        private static bool RENDER_FLAG = false;
         private static float metersInSpace = 29.9f;
 
-        private int interpenetrations_before_disable = 35;
-
         private IntPtr contactgroup;
         private IntPtr LandGeom = (IntPtr) 0;
         private float[] _heightmap;