aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/UDPServer.cs21
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs7
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs2
3 files changed, 5 insertions, 25 deletions
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 395037f..fe2e805 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -364,23 +364,12 @@ namespace OpenSim.Region.ClientStack
364 public void ServerListener() 364 public void ServerListener()
365 { 365 {
366 uint newPort = listenPort; 366 uint newPort = listenPort;
367 m_log.Info("[SERVER]: Opening UDP socket on " + listenIP.ToString() + " " + newPort + ".");// Allow alternate ports: " + Allow_Alternate_Port.ToString()); 367 m_log.Info("[SERVER]: Opening UDP socket on " + listenIP.ToString() + " " + newPort + ".");
368 try
369 {
370 ServerIncoming = new IPEndPoint(listenIP, (int)newPort);
371 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
372 Server.Bind(ServerIncoming);
373 listenPort = newPort;
374 }
375 catch (Exception ex)
376 {
377 // We are not looking for alternate ports?
378 //if (!Allow_Alternate_Port)
379 throw (ex);
380 368
381 // We are looking for alternate ports! 369 ServerIncoming = new IPEndPoint(listenIP, (int)newPort);
382 //m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next."); 370 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
383 } 371 Server.Bind(ServerIncoming);
372 listenPort = newPort;
384 373
385 m_log.Info("[SERVER]: UDP socket bound, getting ready to listen"); 374 m_log.Info("[SERVER]: UDP socket bound, getting ready to listen");
386 375
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index f335246..b5263a6 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -82,11 +82,9 @@ namespace OpenSim.Region.Physics.OdePlugin
82 private bool m_wascolliding = false; 82 private bool m_wascolliding = false;
83 private bool m_wascollidingGround = false; 83 private bool m_wascollidingGround = false;
84 private bool m_iscollidingObj = false; 84 private bool m_iscollidingObj = false;
85 private bool m_wascollidingObj = false;
86 private bool m_alwaysRun = false; 85 private bool m_alwaysRun = false;
87 private bool m_hackSentFall = false; 86 private bool m_hackSentFall = false;
88 private bool m_hackSentFly = false; 87 private bool m_hackSentFly = false;
89 private bool m_foundDebian = false;
90 public uint m_localID = 0; 88 public uint m_localID = 0;
91 89
92 private CollisionLocker ode; 90 private CollisionLocker ode;
@@ -105,9 +103,6 @@ namespace OpenSim.Region.Physics.OdePlugin
105 | CollisionCategories.Body 103 | CollisionCategories.Body
106 | CollisionCategories.Character 104 | CollisionCategories.Character
107 | CollisionCategories.Land); 105 | CollisionCategories.Land);
108
109 private bool jumping = false;
110 //private float gravityAccel;
111 public IntPtr Body; 106 public IntPtr Body;
112 private OdeScene _parent_scene; 107 private OdeScene _parent_scene;
113 public IntPtr Shell; 108 public IntPtr Shell;
@@ -126,7 +121,6 @@ namespace OpenSim.Region.Physics.OdePlugin
126 121
127 if (System.Environment.OSVersion.Platform == PlatformID.Unix) 122 if (System.Environment.OSVersion.Platform == PlatformID.Unix)
128 { 123 {
129 m_foundDebian = true;
130 m_tensor = 2000000f; 124 m_tensor = 2000000f;
131 } 125 }
132 else 126 else
@@ -409,7 +403,6 @@ namespace OpenSim.Region.Physics.OdePlugin
409 403
410 if (System.Environment.OSVersion.Platform == PlatformID.Unix) 404 if (System.Environment.OSVersion.Platform == PlatformID.Unix)
411 { 405 {
412 m_foundDebian = true;
413 m_tensor = 2000000f; 406 m_tensor = 2000000f;
414 } 407 }
415 else 408 else
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 726f2e9..fb40830 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -120,8 +120,6 @@ namespace OpenSim.Region.Physics.OdePlugin
120 120
121 private IntPtr m_linkJoint = (IntPtr)0; 121 private IntPtr m_linkJoint = (IntPtr)0;
122 122
123 private int debugcounter = 0;
124
125 public OdePrim(String primName, OdeScene parent_scene, PhysicsVector pos, PhysicsVector size, 123 public OdePrim(String primName, OdeScene parent_scene, PhysicsVector pos, PhysicsVector size,
126 Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode) 124 Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode)
127 { 125 {