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

* Four more warnings, etc etc.

0.6.0-stable
Adam Frisby 2008-03-05 22:00:41 +00:00
parent 810d2126ea
commit 1410210b84
3 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -364,23 +364,12 @@ namespace OpenSim.Region.ClientStack
public void ServerListener() public void ServerListener()
{ {
uint newPort = listenPort; uint newPort = listenPort;
m_log.Info("[SERVER]: Opening UDP socket on " + listenIP.ToString() + " " + newPort + ".");// Allow alternate ports: " + Allow_Alternate_Port.ToString()); m_log.Info("[SERVER]: Opening UDP socket on " + listenIP.ToString() + " " + newPort + ".");
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);
// We are looking for alternate ports! ServerIncoming = new IPEndPoint(listenIP, (int)newPort);
//m_log.Info("[SERVER]: UDP socket on " + listenIP.ToString() + " " + listenPort.ToString() + " is not available, trying next."); 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"); m_log.Info("[SERVER]: UDP socket bound, getting ready to listen");

7
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@ -82,11 +82,9 @@ namespace OpenSim.Region.Physics.OdePlugin
private bool m_wascolliding = false; private bool m_wascolliding = false;
private bool m_wascollidingGround = false; private bool m_wascollidingGround = false;
private bool m_iscollidingObj = false; private bool m_iscollidingObj = false;
private bool m_wascollidingObj = false;
private bool m_alwaysRun = false; private bool m_alwaysRun = false;
private bool m_hackSentFall = false; private bool m_hackSentFall = false;
private bool m_hackSentFly = false; private bool m_hackSentFly = false;
private bool m_foundDebian = false;
public uint m_localID = 0; public uint m_localID = 0;
private CollisionLocker ode; private CollisionLocker ode;
@ -105,9 +103,6 @@ namespace OpenSim.Region.Physics.OdePlugin
| CollisionCategories.Body | CollisionCategories.Body
| CollisionCategories.Character | CollisionCategories.Character
| CollisionCategories.Land); | CollisionCategories.Land);
private bool jumping = false;
//private float gravityAccel;
public IntPtr Body; public IntPtr Body;
private OdeScene _parent_scene; private OdeScene _parent_scene;
public IntPtr Shell; public IntPtr Shell;
@ -126,7 +121,6 @@ namespace OpenSim.Region.Physics.OdePlugin
if (System.Environment.OSVersion.Platform == PlatformID.Unix) if (System.Environment.OSVersion.Platform == PlatformID.Unix)
{ {
m_foundDebian = true;
m_tensor = 2000000f; m_tensor = 2000000f;
} }
else else
@ -409,7 +403,6 @@ namespace OpenSim.Region.Physics.OdePlugin
if (System.Environment.OSVersion.Platform == PlatformID.Unix) if (System.Environment.OSVersion.Platform == PlatformID.Unix)
{ {
m_foundDebian = true;
m_tensor = 2000000f; m_tensor = 2000000f;
} }
else else

2
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -120,8 +120,6 @@ namespace OpenSim.Region.Physics.OdePlugin
private IntPtr m_linkJoint = (IntPtr)0; private IntPtr m_linkJoint = (IntPtr)0;
private int debugcounter = 0;
public OdePrim(String primName, OdeScene parent_scene, PhysicsVector pos, PhysicsVector size, public OdePrim(String primName, OdeScene parent_scene, PhysicsVector pos, PhysicsVector size,
Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode) Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode)
{ {