From dfa2f7d7151ec0e3835c4a008897389353be1cb3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 1 Aug 2011 05:34:02 +0100
Subject: If a prim changes size or shape, add actor to
 _parent_scene.actor_name_map with new prim_geom key, as the old one becomes
 invalid.

This resolves http://opensimulator.org/mantis/view.php?id=5603 where changing size or shape would stop collision_start being fired in a running script.
In both this and existing code we are not removing old actors from actor_name_map when the existing prim_geom is removed, which leads to a small memory leak over time.
This needs to be fixed.
---
 OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics/OdePlugin')

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index fdb95cf..e18e1b4 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -1481,7 +1481,7 @@ Console.WriteLine("changeadd 1");
             }
 
             _parent_scene.geom_name_map[prim_geom] = this.Name;
-            _parent_scene.actor_name_map[prim_geom] = (PhysicsActor)this;
+            _parent_scene.actor_name_map[prim_geom] = this;
 
             changeSelectedStatus(timestep);
 
@@ -1991,6 +1991,7 @@ Console.WriteLine(" JointCreateFixed");
             }
 
             _parent_scene.geom_name_map[prim_geom] = oldname;
+            _parent_scene.actor_name_map[prim_geom] = this;
 
             changeSelectedStatus(timestamp);
             if (childPrim)
@@ -2095,7 +2096,9 @@ Console.WriteLine(" JointCreateFixed");
                     d.BodyEnable(Body);
                 }
             }
+
             _parent_scene.geom_name_map[prim_geom] = oldname;
+            _parent_scene.actor_name_map[prim_geom] = this;
 
             changeSelectedStatus(timestamp);
             if (childPrim)
-- 
cgit v1.1