diff options
author | Adam Frisby | 2008-03-05 22:00:41 +0000 |
---|---|---|
committer | Adam Frisby | 2008-03-05 22:00:41 +0000 |
commit | 1410210b844d4b613b3166f57cdc63cfd4148ed0 (patch) | |
tree | c25e19183593d6a04823f118659238fe8e4499ae /OpenSim/Region/Physics/OdePlugin | |
parent | * Three more warnings are a-gone. (diff) | |
download | opensim-SC-1410210b844d4b613b3166f57cdc63cfd4148ed0.zip opensim-SC-1410210b844d4b613b3166f57cdc63cfd4148ed0.tar.gz opensim-SC-1410210b844d4b613b3166f57cdc63cfd4148ed0.tar.bz2 opensim-SC-1410210b844d4b613b3166f57cdc63cfd4148ed0.tar.xz |
* Four more warnings, etc etc.
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 2 |
2 files changed, 0 insertions, 9 deletions
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 | { |