diff options
| author | BlueWall | 2012-04-26 16:13:47 -0400 |
|---|---|---|
| committer | BlueWall | 2012-04-26 16:13:47 -0400 |
| commit | fba802bb03b7dee804059eae888b63c88280389c (patch) | |
| tree | ca7312919830dd469dfd4e9b739d5291702007e4 /OpenSim/Region/Physics/OdePlugin | |
| parent | Add a version of osNpcSay that takes a channel number Mantis 5747 (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-fba802bb03b7dee804059eae888b63c88280389c.zip opensim-SC_OLD-fba802bb03b7dee804059eae888b63c88280389c.tar.gz opensim-SC_OLD-fba802bb03b7dee804059eae888b63c88280389c.tar.bz2 opensim-SC_OLD-fba802bb03b7dee804059eae888b63c88280389c.tar.xz | |
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
| -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 | { |