From 6618948ff9b1e98b52f3067855ca1b05e7e36144 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 1 Aug 2011 06:15:02 +0100
Subject: refactor: centralize prim geom removal code from four places to one

---
 OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

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

diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 4419dff..3402be2 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -2094,6 +2094,8 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         public override void RemovePrim(PhysicsActor prim)
         {
+            // As with all ODE physics operations, we don't remove the prim immediately but signal that it should be
+            // removed in the next physics simulate pass.
             if (prim is OdePrim)
             {
                 lock (OdeLock)
@@ -2169,24 +2171,12 @@ namespace OpenSim.Region.Physics.OdePlugin
                         //}
                         //}
                         //m_log.Warn(prim.prim_geom);
-                        try
-                        {
-                            if (prim.prim_geom != IntPtr.Zero)
-                            {
-                                d.GeomDestroy(prim.prim_geom);
-                                prim.prim_geom = IntPtr.Zero;
-                            }
-                            else
-                            {
-                                m_log.Warn("[PHYSICS]: Unable to remove prim from physics scene");
-                            }
-                        }
-                        catch (AccessViolationException)
-                        {
-                            m_log.Info("[PHYSICS]: Couldn't remove prim from physics scene, it was already be removed.");
-                        }
+
+                        if (!prim.RemoveGeom())
+                            m_log.Warn("[PHYSICS]: Unable to remove prim from physics scene");
+
                         lock (_prims)
-                        _prims.Remove(prim);
+                            _prims.Remove(prim);
 
                         //If there are no more geometries in the sub-space, we don't need it in the main space anymore
                         //if (d.SpaceGetNumGeoms(prim.m_targetSpace) == 0)
-- 
cgit v1.1