ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Four more warnings, etc etc.

Browse Source
This commit is contained in:
Adam Frisby
2008-03-05 22:00:41 +00:00
parent 810d2126ea
commit 1410210b84
3 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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_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

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 int debugcounter = 0;
public OdePrim(String primName, OdeScene parent_scene, PhysicsVector pos, PhysicsVector size,
Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode)
{