From b6d83e9c0f4bd1d450e36270278285be50d5ace8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 16 Nov 2011 23:01:59 +0000
Subject: Stop OdePrim and OdeCharacter insanely overriding set LocalID to set
 their own private m_localID property but leaving get to return the then unset
 PhysicsActor.LocalId!

Instead, just have both subclasses use the PhysicsActor.LocalID property.
This restores collision functionality that fell away in 45c7789 yesterday
---
 OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 2f9a54b..1ba7ef7 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -142,8 +142,6 @@ namespace OpenSim.Region.Physics.OdePlugin
         public bool m_taintselected { get; private set; }
         public bool m_taintCollidesWater { get; private set; }
 
-        public uint m_localID { get; private set; }
-
         private bool m_taintforce = false;
         private bool m_taintaddangularforce = false;
         private Vector3 m_force;
@@ -290,13 +288,6 @@ namespace OpenSim.Region.Physics.OdePlugin
             set { return; }
         }
 
-        public override uint LocalID
-        {
-            set {
-                //m_log.Info("[PHYSICS]: Setting TrackerID: " + value);
-                m_localID = value; }
-        }
-
         public override bool Grabbed
         {
             set { return; }
@@ -1058,7 +1049,7 @@ Console.WriteLine("ZProcessTaints for " + Name);
         private void AddChildPrim(OdePrim prim)
         {
 //Console.WriteLine("AddChildPrim  " + Name);
-            if (this.m_localID != prim.m_localID)
+            if (LocalID != prim.LocalID)
             {
                 if (Body == IntPtr.Zero)
                 {
-- 
cgit v1.1