aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs5
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs5
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs10
3 files changed, 15 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 38df751..dd58a4e 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -223,6 +223,11 @@ namespace OpenSim.Region.Physics.OdePlugin
223 set { m_localID = value; } 223 set { m_localID = value; }
224 } 224 }
225 225
226 public override int GetHashCode()
227 {
228 return (int)m_localID;
229 }
230
226 public override bool Grabbed 231 public override bool Grabbed
227 { 232 {
228 set { return; } 233 set { return; }
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index d0f77e6..673ae39 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -260,6 +260,11 @@ namespace OpenSim.Region.Physics.OdePlugin
260 m_localID = value; } 260 m_localID = value; }
261 } 261 }
262 262
263 public override int GetHashCode()
264 {
265 return (int)m_localID;
266 }
267
263 public override bool Grabbed 268 public override bool Grabbed
264 { 269 {
265 set { return; } 270 set { return; }
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 817cc22..e702d5e 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -235,11 +235,11 @@ namespace OpenSim.Region.Physics.OdePlugin
235 private d.NearCallback nearCallback; 235 private d.NearCallback nearCallback;
236 public d.TriCallback triCallback; 236 public d.TriCallback triCallback;
237 public d.TriArrayCallback triArrayCallback; 237 public d.TriArrayCallback triArrayCallback;
238 private readonly List<OdeCharacter> _characters = new List<OdeCharacter>(); 238 private readonly HashSet<OdeCharacter> _characters = new HashSet<OdeCharacter>();
239 private readonly List<OdePrim> _prims = new List<OdePrim>(); 239 private readonly HashSet<OdePrim> _prims = new HashSet<OdePrim>();
240 private readonly List<OdePrim> _activeprims = new List<OdePrim>(); 240 private readonly HashSet<OdePrim> _activeprims = new HashSet<OdePrim>();
241 private readonly List<OdePrim> _taintedPrim = new List<OdePrim>(); 241 private readonly HashSet<OdePrim> _taintedPrim = new HashSet<OdePrim>();
242 private readonly List<OdeCharacter> _taintedActors = new List<OdeCharacter>(); 242 private readonly HashSet<OdeCharacter> _taintedActors = new HashSet<OdeCharacter>();
243 private readonly List<d.ContactGeom> _perloopContact = new List<d.ContactGeom>(); 243 private readonly List<d.ContactGeom> _perloopContact = new List<d.ContactGeom>();
244 private readonly List<PhysicsActor> _collisionEventPrim = new List<PhysicsActor>(); 244 private readonly List<PhysicsActor> _collisionEventPrim = new List<PhysicsActor>();
245 public Dictionary<IntPtr, String> geom_name_map = new Dictionary<IntPtr, String>(); 245 public Dictionary<IntPtr, String> geom_name_map = new Dictionary<IntPtr, String>();