diff options
| author | idb | 2009-01-18 11:25:12 +0000 |
|---|---|---|
| committer | idb | 2009-01-18 11:25:12 +0000 |
| commit | ed0661e25ad6457b993ec498a665a9c794991a2e (patch) | |
| tree | 35cc12203d5fa472c1f840c0401ad45badc0a652 /OpenSim | |
| parent | Added an optional password for the IRC module (diff) | |
| download | opensim-SC_OLD-ed0661e25ad6457b993ec498a665a9c794991a2e.zip opensim-SC_OLD-ed0661e25ad6457b993ec498a665a9c794991a2e.tar.gz opensim-SC_OLD-ed0661e25ad6457b993ec498a665a9c794991a2e.tar.bz2 opensim-SC_OLD-ed0661e25ad6457b993ec498a665a9c794991a2e.tar.xz | |
Subscribe to collision events if needed when turning an object to non-phantom from phantom.
Fixes Mantis #1883
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 10 |
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) { | |||
| 3478 | } | 3478 | } |
| 3479 | } | 3479 | } |
| 3480 | } | 3480 | } |
| 3481 | if ( | ||
| 3482 | ((AggregateScriptEvents & scriptEvents.collision) != 0) || | ||
| 3483 | ((AggregateScriptEvents & scriptEvents.collision_end) != 0) || | ||
| 3484 | ((AggregateScriptEvents & scriptEvents.collision_start) != 0) || | ||
| 3485 | (CollisionSound != UUID.Zero) | ||
| 3486 | ) | ||
| 3487 | { | ||
| 3488 | PhysActor.OnCollisionUpdate += PhysicsCollision; | ||
| 3489 | PhysActor.SubscribeEvents(1000); | ||
| 3490 | } | ||
| 3481 | } | 3491 | } |
| 3482 | } | 3492 | } |
| 3483 | else // it already has a physical representation | 3493 | else // it already has a physical representation |