Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

3 files changed, 103 insertions, 60 deletions

diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
index 38c38b6..61c16b8 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
@@ -565,7 +565,29 @@ namespace OpenSim.Region.Physics.OdePlugin
                 CAPSULE_RADIUS = 0.01f;
 
             }
+
+            if(Shell != IntPtr.Zero)
+            {
+                try
+                {
+                    d.GeomDestroy(Shell);
+                }
+                catch (System.AccessViolationException)
+                {
+                    m_log.Error("[PHYSICS]: PrimGeom dead");
+                }
+                // Remove any old entries
+//string tShell;
+//_parent_scene.geom_name_map.TryGetValue(Shell, out tShell);
+//Console.WriteLine("**** Remove {0}", tShell);
+                if(_parent_scene.geom_name_map.ContainsKey(Shell)) _parent_scene.geom_name_map.Remove(Shell);
+                if(_parent_scene.actor_name_map.ContainsKey(Shell)) _parent_scene.actor_name_map.Remove(Shell);
+            }
+
             Shell = d.CreateCapsule(_parent_scene.space, CAPSULE_RADIUS, CAPSULE_LENGTH);
+            _parent_scene.geom_name_map[Shell] = m_name;
+            _parent_scene.actor_name_map[Shell] = (PhysicsActor)this;
+//Console.WriteLine("**** Create {2}    Dicts: actor={0}   name={1}", _parent_scene.actor_name_map.Count, _parent_scene.geom_name_map.Count, m_name);
 
             d.GeomSetCategoryBits(Shell, (int)m_collisionCategories);
             d.GeomSetCollideBits(Shell, (int)m_collisionFlags);
@@ -931,10 +953,23 @@ namespace OpenSim.Region.Physics.OdePlugin
                     Body = IntPtr.Zero;
                 }
 
-                if (Shell != IntPtr.Zero)
+                    if(Shell != IntPtr.Zero)
                 {
-                    d.GeomDestroy(Shell);
-                    _parent_scene.geom_name_map.Remove(Shell);
+                    try
+                    {
+                        d.GeomDestroy(Shell);
+                    }
+                    catch (System.AccessViolationException)
+                    {
+                        m_log.Error("[PHYSICS]: PrimGeom dead");
+                    }
+                    // Remove any old entries
+//string tShell;
+//_parent_scene.geom_name_map.TryGetValue(Shell, out tShell);
+//Console.WriteLine("**** Remove {0}", tShell);
+
+                    if(_parent_scene.geom_name_map.ContainsKey(Shell)) _parent_scene.geom_name_map.Remove(Shell);
+                    if(_parent_scene.actor_name_map.ContainsKey(Shell)) _parent_scene.actor_name_map.Remove(Shell);
                     Shell = IntPtr.Zero;
                 }
 
@@ -1097,11 +1132,24 @@ namespace OpenSim.Region.Physics.OdePlugin
 
                     Body = IntPtr.Zero;
                 }
-
-                if (Shell != IntPtr.Zero)
+    
+                    if(Shell != IntPtr.Zero)
                 {
-                    d.GeomDestroy(Shell);
-                    _parent_scene.geom_name_map.Remove(Shell);
+                    try
+                    {
+                        d.GeomDestroy(Shell);
+                    }
+                    catch (System.AccessViolationException)
+                    {
+                        m_log.Error("[PHYSICS]: PrimGeom dead");
+                    }
+                    // Remove any old entries
+//string tShell;
+//_parent_scene.geom_name_map.TryGetValue(Shell, out tShell);
+//Console.WriteLine("**** Remove {0}", tShell);
+
+                    if(_parent_scene.geom_name_map.ContainsKey(Shell)) _parent_scene.geom_name_map.Remove(Shell);
+                    if(_parent_scene.actor_name_map.ContainsKey(Shell)) _parent_scene.actor_name_map.Remove(Shell);
                     Shell = IntPtr.Zero;
                 }
             }
@@ -1277,9 +1325,6 @@ namespace OpenSim.Region.Physics.OdePlugin
                             + (Amotor!=IntPtr.Zero ? "Amotor ":""));
                     }
                     AvatarGeomAndBodyCreation(_position.X, _position.Y, _position.Z, m_tensor);
-                    
-                    _parent_scene.geom_name_map[Shell] = m_name;
-                    _parent_scene.actor_name_map[Shell] = (PhysicsActor)this;
                     _parent_scene.AddCharacter(this);
                 }
                 else
@@ -1299,17 +1344,28 @@ namespace OpenSim.Region.Physics.OdePlugin
                     {
                         //kill the body
                         d.BodyDestroy(Body);
-
                         Body = IntPtr.Zero;
                     }
 
-                    if (Shell != IntPtr.Zero)
+                    if(Shell != IntPtr.Zero)
                     {
-                        d.GeomDestroy(Shell);
-                        _parent_scene.geom_name_map.Remove(Shell);
+                        try
+                        {
+                            d.GeomDestroy(Shell);
+                        }
+                        catch (System.AccessViolationException)
+                        {
+                            m_log.Error("[PHYSICS]: PrimGeom dead");
+                        }
+                        // Remove any old entries
+//string tShell;
+//_parent_scene.geom_name_map.TryGetValue(Shell, out tShell);
+//Console.WriteLine("**** Remove {0}", tShell);
+
+                        if(_parent_scene.geom_name_map.ContainsKey(Shell)) _parent_scene.geom_name_map.Remove(Shell);
+                        if(_parent_scene.actor_name_map.ContainsKey(Shell)) _parent_scene.actor_name_map.Remove(Shell);
                         Shell = IntPtr.Zero;
                     }
-
                 }
 
                 m_isPhysical = m_tainted_isPhysical;
@@ -1327,13 +1383,9 @@ namespace OpenSim.Region.Physics.OdePlugin
                     CAPSULE_LENGTH = m_tainted_CAPSULE_LENGTH;
                     //m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString());
                     d.BodyDestroy(Body);
-                    d.GeomDestroy(Shell);
                     AvatarGeomAndBodyCreation(_position.X, _position.Y,
                                       _position.Z + (Math.Abs(CAPSULE_LENGTH - prevCapsule) * 2), m_tensor);
                     Velocity = Vector3.Zero;
-
-                    _parent_scene.geom_name_map[Shell] = m_name;
-                    _parent_scene.actor_name_map[Shell] = (PhysicsActor)this;
                 }
                 else
                 {
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
index 7ce01dc..6b17ce7 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         private OdeScene _parent_scene;
         public IntPtr m_targetSpace = IntPtr.Zero;
         public IntPtr prim_geom;
-        public IntPtr prev_geom;
+//        public IntPtr prev_geom;
         public IntPtr _triMeshData;
 
         private IntPtr _linkJointGroup = IntPtr.Zero;
@@ -274,7 +274,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
 
             prim_geom = IntPtr.Zero;
-            prev_geom = IntPtr.Zero;
+//            prev_geom = IntPtr.Zero;
 
             if (!pos.IsFinite())
             {
@@ -776,13 +776,26 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         public void SetGeom(IntPtr geom)
         {
-            prev_geom = prim_geom;
+            if(prim_geom != IntPtr.Zero)
+            {
+                // Remove any old entries
+//string tPA;
+//_parent_scene.geom_name_map.TryGetValue(prim_geom, out tPA);
+//Console.WriteLine("**** Remove {0}", tPA);
+                if(_parent_scene.geom_name_map.ContainsKey(prim_geom)) _parent_scene.geom_name_map.Remove(prim_geom);
+                if(_parent_scene.actor_name_map.ContainsKey(prim_geom)) _parent_scene.actor_name_map.Remove(prim_geom);
+                d.GeomDestroy(prim_geom);
+                }
+
             prim_geom = geom;
 //Console.WriteLine("SetGeom to " + prim_geom + " for " + m_primName);     
             if (prim_geom != IntPtr.Zero)
             {
+                _parent_scene.geom_name_map[prim_geom] = this.m_primName;
+                _parent_scene.actor_name_map[prim_geom] = (PhysicsActor)this;
                 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
                 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
+//Console.WriteLine("**** Create {2}    Dicts: actor={0}   name={1}", _parent_scene.actor_name_map.Count, _parent_scene.geom_name_map.Count, this.m_primName);
             }
 
             if (childPrim)
@@ -1774,17 +1787,17 @@ namespace OpenSim.Region.Physics.OdePlugin
         public void CreateGeom(IntPtr m_targetSpace, IMesh _mesh)
         {
 //Console.WriteLine("CreateGeom:");         
-            if (_mesh != null)
+            if (_mesh != null)                                  // Special - make mesh
             {
                 setMesh(_parent_scene, _mesh);
             }
-            else
+            else                                                // not a mesh
             {
-                if (_pbs.ProfileShape == ProfileShape.HalfCircle && _pbs.PathCurve == (byte)Extrusion.Curve1)
+                if (_pbs.ProfileShape == ProfileShape.HalfCircle && _pbs.PathCurve == (byte)Extrusion.Curve1)           // special profile??
                 {
-                    if (_size.X == _size.Y && _size.Y == _size.Z && _size.X == _size.Z)
+                    if (_size.X == _size.Y && _size.Y == _size.Z && _size.X == _size.Z)                                 // Equi-size
                     {
-                        if (((_size.X / 2f) > 0f))
+                        if (((_size.X / 2f) > 0f))                                                                      // Has size
                         {
                             _parent_scene.waitForSpaceUnlock(m_targetSpace);
                             try
@@ -1815,7 +1828,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                             }
                         }
                     }
-                    else
+                    else                                                                                                // not equi-size
                     {
                         _parent_scene.waitForSpaceUnlock(m_targetSpace);
                         try
@@ -1832,7 +1845,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                     }
                 }
 
-                else
+                else                                                                                    // not special profile
                 {
                     _parent_scene.waitForSpaceUnlock(m_targetSpace);
                     try
@@ -1894,9 +1907,6 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }
             }
 
-            _parent_scene.geom_name_map[prim_geom] = this.m_primName;
-            _parent_scene.actor_name_map[prim_geom] = (PhysicsActor)this;
-
             changeSelectedStatus(timestep);
 
             m_taintadd = false;
@@ -2045,22 +2055,7 @@ Console.WriteLine(" JointCreateFixed");
                 {
                     if (_pbs.SculptEntry && _parent_scene.meshSculptedPrim)
                     {
-                        
-
-                        if (prim_geom != IntPtr.Zero)
-                        {
-                            try
-                            {
-                                d.GeomDestroy(prim_geom);
-                                prim_geom = IntPtr.Zero;
-                                _mesh = null;
-                            }
-                            catch (System.AccessViolationException)
-                            {
-                                prim_geom = IntPtr.Zero;
-                                m_log.Error("[PHYSICS]: PrimGeom dead");
-                            }
-                        }
+                        _mesh = null;
 //Console.WriteLine("changePhysicsStatus for " + m_primName );
                         changeadd(2f);
                     }
@@ -2120,8 +2115,6 @@ Console.WriteLine(" JointCreateFixed");
                 _parent_scene.waitForSpaceUnlock(m_targetSpace);
                 d.SpaceRemove(m_targetSpace, prim_geom);
             }
-            d.GeomDestroy(prim_geom);
-            prim_geom = IntPtr.Zero;
             // we don't need to do space calculation because the client sends a position update also.
 
             // Construction of new prim
@@ -2223,16 +2216,8 @@ Console.WriteLine(" JointCreateFixed");
                     disableBody();
                 }
             }
-            try
-            {
-                d.GeomDestroy(prim_geom);
-            }
-            catch (System.AccessViolationException)
-            {
-                prim_geom = IntPtr.Zero;
-                m_log.Error("[PHYSICS]: PrimGeom dead");
-            }
-            prim_geom = IntPtr.Zero;
+
+
             // we don't need to do space calculation because the client sends a position update also.
             if (_size.X <= 0) _size.X = 0.01f;
             if (_size.Y <= 0) _size.Y = 0.01f;
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
index 79e2986..ab084fd 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
@@ -2206,6 +2206,12 @@ namespace OpenSim.Region.Physics.OdePlugin
                         {
                             if (prim.prim_geom != IntPtr.Zero)
                             {
+
+//string tPA;
+//geom_name_map.TryGetValue(prim.prim_geom, out tPA);
+//Console.WriteLine("**** Remove {0}", tPA);
+                                if(geom_name_map.ContainsKey(prim.prim_geom)) geom_name_map.Remove(prim.prim_geom);
+                                if(actor_name_map.ContainsKey(prim.prim_geom)) actor_name_map.Remove(prim.prim_geom);
                                 d.GeomDestroy(prim.prim_geom);
                                 prim.prim_geom = IntPtr.Zero;
                             }