From 1410210b844d4b613b3166f57cdc63cfd4148ed0 Mon Sep 17 00:00:00 2001
From: Adam Frisby <adam@gwala.net>
Date: Wed, 5 Mar 2008 22:00:41 +0000
Subject: [PATCH] * Four more warnings, etc etc.

---
 OpenSim/Region/ClientStack/UDPServer.cs       | 21 +++++--------------
 .../Region/Physics/OdePlugin/ODECharacter.cs  |  7 -------
 OpenSim/Region/Physics/OdePlugin/ODEPrim.cs   |  2 --
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 395037fce8..fe2e80580b 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -364,23 +364,12 @@ namespace OpenSim.Region.ClientStack
         public void ServerListener()
         {
             uint newPort = listenPort;
-            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;
-            }
-            catch (Exception ex)
-            {
-                // We are not looking for alternate ports?
-                //if (!Allow_Alternate_Port)
-                throw (ex);
+            m_log.Info("[SERVER]: Opening UDP socket on " + listenIP.ToString() + " " + newPort + ".");
 
-                // We are looking for alternate ports!
-                //m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next.");
-            }
+            ServerIncoming = new IPEndPoint(listenIP, (int)newPort);
+            Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+            Server.Bind(ServerIncoming);
+            listenPort = newPort;
 
             m_log.Info("[SERVER]: UDP socket bound, getting ready to listen");
 
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index f3352468c2..b5263a650f 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -82,11 +82,9 @@ namespace OpenSim.Region.Physics.OdePlugin
         private bool m_wascolliding = false;
         private bool m_wascollidingGround = false;
         private bool m_iscollidingObj = false;
-        private bool m_wascollidingObj = false;
         private bool m_alwaysRun = false;
         private bool m_hackSentFall = false;
         private bool m_hackSentFly = false;
-        private bool m_foundDebian = false;
         public uint m_localID = 0;
 
         private CollisionLocker ode;
@@ -105,9 +103,6 @@ namespace OpenSim.Region.Physics.OdePlugin
                                                         | CollisionCategories.Body
                                                         | CollisionCategories.Character 
                                                         | CollisionCategories.Land);
-
-        private bool jumping = false;
-        //private float gravityAccel;
         public IntPtr Body;
         private OdeScene _parent_scene;
         public IntPtr Shell;
@@ -126,7 +121,6 @@ namespace OpenSim.Region.Physics.OdePlugin
 
             if (System.Environment.OSVersion.Platform == PlatformID.Unix)
             {
-                m_foundDebian = true;
                 m_tensor = 2000000f;
             }
             else
@@ -409,7 +403,6 @@ namespace OpenSim.Region.Physics.OdePlugin
 
             if (System.Environment.OSVersion.Platform == PlatformID.Unix)
             {
-                m_foundDebian = true;
                 m_tensor = 2000000f;
             }
             else
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 726f2e9492..fb40830e49 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -120,8 +120,6 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         private IntPtr m_linkJoint = (IntPtr)0;
 
-        private int debugcounter = 0;
-
         public OdePrim(String primName, OdeScene parent_scene, PhysicsVector pos, PhysicsVector size,
                        Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode)
         {