diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 876629e..3dd80ea 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
117 | public class OdeScene : PhysicsScene | 117 | public class OdeScene : PhysicsScene |
118 | { | 118 | { |
119 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 119 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
120 | private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>(); | 120 | // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>(); |
121 | 121 | ||
122 | CollisionLocker ode; | 122 | CollisionLocker ode; |
123 | 123 | ||
@@ -196,7 +196,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
196 | 196 | ||
197 | private float[] _watermap; | 197 | private float[] _watermap; |
198 | 198 | ||
199 | private float[] _origheightmap; | 199 | // private float[] _origheightmap; |
200 | 200 | ||
201 | private d.NearCallback nearCallback; | 201 | private d.NearCallback nearCallback; |
202 | public d.TriCallback triCallback; | 202 | public d.TriCallback triCallback; |
@@ -226,7 +226,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
226 | //Ckrinke private int ms = 0; | 226 | //Ckrinke private int ms = 0; |
227 | public IntPtr world; | 227 | public IntPtr world; |
228 | //private bool returncollisions = false; | 228 | //private bool returncollisions = false; |
229 | private uint obj1LocalID = 0; | 229 | // private uint obj1LocalID = 0; |
230 | private uint obj2LocalID = 0; | 230 | private uint obj2LocalID = 0; |
231 | //private int ctype = 0; | 231 | //private int ctype = 0; |
232 | private OdeCharacter cc1; | 232 | private OdeCharacter cc1; |
@@ -501,7 +501,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
501 | IntPtr b1 = d.GeomGetBody(g1); | 501 | IntPtr b1 = d.GeomGetBody(g1); |
502 | IntPtr b2 = d.GeomGetBody(g2); | 502 | IntPtr b2 = d.GeomGetBody(g2); |
503 | 503 | ||
504 | d.GeomClassID id = d.GeomGetClass(g1); | 504 | // d.GeomClassID id = d.GeomGetClass(g1); |
505 | 505 | ||
506 | String name1 = null; | 506 | String name1 = null; |
507 | String name2 = null; | 507 | String name2 = null; |
@@ -837,7 +837,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
837 | 837 | ||
838 | private void collision_accounting_events(PhysicsActor p1, PhysicsActor p2, float collisiondepth) | 838 | private void collision_accounting_events(PhysicsActor p1, PhysicsActor p2, float collisiondepth) |
839 | { | 839 | { |
840 | obj1LocalID = 0; | 840 | // obj1LocalID = 0; |
841 | //returncollisions = false; | 841 | //returncollisions = false; |
842 | obj2LocalID = 0; | 842 | obj2LocalID = 0; |
843 | //ctype = 0; | 843 | //ctype = 0; |
@@ -850,7 +850,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
850 | case ActorTypes.Agent: | 850 | case ActorTypes.Agent: |
851 | cc2 = (OdeCharacter)p2; | 851 | cc2 = (OdeCharacter)p2; |
852 | 852 | ||
853 | obj1LocalID = cc2.m_localID; | 853 | // obj1LocalID = cc2.m_localID; |
854 | switch ((ActorTypes)p1.PhysicsActorType) | 854 | switch ((ActorTypes)p1.PhysicsActorType) |
855 | { | 855 | { |
856 | case ActorTypes.Agent: | 856 | case ActorTypes.Agent: |
@@ -893,7 +893,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
893 | case ActorTypes.Prim: | 893 | case ActorTypes.Prim: |
894 | cp2 = (OdePrim)p2; | 894 | cp2 = (OdePrim)p2; |
895 | 895 | ||
896 | obj1LocalID = cp2.m_localID; | 896 | // obj1LocalID = cp2.m_localID; |
897 | switch ((ActorTypes)p1.PhysicsActorType) | 897 | switch ((ActorTypes)p1.PhysicsActorType) |
898 | { | 898 | { |
899 | case ActorTypes.Agent: | 899 | case ActorTypes.Agent: |
@@ -2084,7 +2084,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2084 | { | 2084 | { |
2085 | // this._heightmap[i] = (double)heightMap[i]; | 2085 | // this._heightmap[i] = (double)heightMap[i]; |
2086 | // dbm (danx0r) -- creating a buffer zone of one extra sample all around | 2086 | // dbm (danx0r) -- creating a buffer zone of one extra sample all around |
2087 | _origheightmap = heightMap; | 2087 | // _origheightmap = heightMap; |
2088 | const uint heightmapWidth = m_regionWidth + 2; | 2088 | const uint heightmapWidth = m_regionWidth + 2; |
2089 | const uint heightmapHeight = m_regionHeight + 2; | 2089 | const uint heightmapHeight = m_regionHeight + 2; |
2090 | const uint heightmapWidthSamples = 2*m_regionWidth + 2; | 2090 | const uint heightmapWidthSamples = 2*m_regionWidth + 2; |