diff options
author | Robert Adams | 2013-09-09 14:47:49 -0700 |
---|---|---|
committer | Robert Adams | 2013-09-09 14:50:33 -0700 |
commit | b05cb3b2bfd6f3912fb33a790b7c2d1ed898d539 (patch) | |
tree | 727c48032bc0fe8c6f5ab7170980476c5dd36cd7 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Fix configuration/ini expansion issue. Thanks to smxy for testing. (diff) | |
download | opensim-SC_OLD-b05cb3b2bfd6f3912fb33a790b7c2d1ed898d539.zip opensim-SC_OLD-b05cb3b2bfd6f3912fb33a790b7c2d1ed898d539.tar.gz opensim-SC_OLD-b05cb3b2bfd6f3912fb33a790b7c2d1ed898d539.tar.bz2 opensim-SC_OLD-b05cb3b2bfd6f3912fb33a790b7c2d1ed898d539.tar.xz |
Change collision logic in SceneObjectPart so land_collision will happen.
The previous logic would generate land_collision_start and land_collision_end
but would not generate the land_collision itself.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index c9ff4f3..2e11162 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2464,12 +2464,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2464 | SendCollisionEvent(scriptEvents.collision_end , endedColliders , ParentGroup.Scene.EventManager.TriggerScriptCollidingEnd); | 2464 | SendCollisionEvent(scriptEvents.collision_end , endedColliders , ParentGroup.Scene.EventManager.TriggerScriptCollidingEnd); |
2465 | 2465 | ||
2466 | if (startedColliders.Contains(0)) | 2466 | if (startedColliders.Contains(0)) |
2467 | { | 2467 | SendLandCollisionEvent(scriptEvents.land_collision_start, ParentGroup.Scene.EventManager.TriggerScriptLandCollidingStart); |
2468 | if (m_lastColliders.Contains(0)) | 2468 | if (m_lastColliders.Contains(0)) |
2469 | SendLandCollisionEvent(scriptEvents.land_collision, ParentGroup.Scene.EventManager.TriggerScriptLandColliding); | 2469 | SendLandCollisionEvent(scriptEvents.land_collision, ParentGroup.Scene.EventManager.TriggerScriptLandColliding); |
2470 | else | ||
2471 | SendLandCollisionEvent(scriptEvents.land_collision_start, ParentGroup.Scene.EventManager.TriggerScriptLandCollidingStart); | ||
2472 | } | ||
2473 | if (endedColliders.Contains(0)) | 2470 | if (endedColliders.Contains(0)) |
2474 | SendLandCollisionEvent(scriptEvents.land_collision_end, ParentGroup.Scene.EventManager.TriggerScriptLandCollidingEnd); | 2471 | SendLandCollisionEvent(scriptEvents.land_collision_end, ParentGroup.Scene.EventManager.TriggerScriptLandCollidingEnd); |
2475 | } | 2472 | } |