diff options
| author | Justin Clark-Casey (justincc) | 2012-04-24 19:49:52 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-04-24 20:15:10 +0100 |
| commit | c6f30e044b6cd2ed8493ad0e2914786eef4f7890 (patch) | |
| tree | bd1443f8935f62fbfb9741e05c148827d215472e /OpenSim | |
| parent | Changed the Map-related messages from Info to Debug. They're debug messages. (diff) | |
| download | opensim-SC_OLD-c6f30e044b6cd2ed8493ad0e2914786eef4f7890.zip opensim-SC_OLD-c6f30e044b6cd2ed8493ad0e2914786eef4f7890.tar.gz opensim-SC_OLD-c6f30e044b6cd2ed8493ad0e2914786eef4f7890.tar.bz2 opensim-SC_OLD-c6f30e044b6cd2ed8493ad0e2914786eef4f7890.tar.xz | |
Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed from ODEPrim.SetGeom.
This occurred in 7a574be3fd from Sat 21 Apr 2012.
This should fix collision detection.
Mnay thanks to tglion for the spot and the fix in http://opensimulator.org/mantis/view.php?id=5988
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 3f88353..0716214 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -338,6 +338,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 338 | d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags); | 338 | d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags); |
| 339 | 339 | ||
| 340 | _parent_scene.geom_name_map[prim_geom] = Name; | 340 | _parent_scene.geom_name_map[prim_geom] = Name; |
| 341 | _parent_scene.actor_name_map[prim_geom] = this; | ||
| 341 | 342 | ||
| 342 | if (childPrim) | 343 | if (childPrim) |
| 343 | { | 344 | { |