Subscribe to collision events if needed when turning an object to non-phantom from phantom.

Fixes Mantis #1883

1 files changed, 10 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 991d5c9..0f36e82 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -3478,6 +3478,16 @@ if (m_shape != null) {
                                 }
                             }
                         }
+                        if (
+                            ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
+                            ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
+                            ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
+                            (CollisionSound != UUID.Zero)
+                            )
+                        {
+                                PhysActor.OnCollisionUpdate += PhysicsCollision;
+                                PhysActor.SubscribeEvents(1000);
+                        }
                     }
                 }
                 else // it already has a physical representation