aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorRobert Adams2013-09-09 14:47:49 -0700
committerJustin Clark-Casey (justincc)2013-09-20 21:01:11 +0100
commita9dcdae6a26bd2ba316ca841f6ca026fb3f8b90f (patch)
tree8aefcba3f0d6d9d92586d9409a523973500dd02e /OpenSim/Region
parentRestore group membership check for HG users in QueryAccess. (diff)
downloadopensim-SC_OLD-a9dcdae6a26bd2ba316ca841f6ca026fb3f8b90f.zip
opensim-SC_OLD-a9dcdae6a26bd2ba316ca841f6ca026fb3f8b90f.tar.gz
opensim-SC_OLD-a9dcdae6a26bd2ba316ca841f6ca026fb3f8b90f.tar.bz2
opensim-SC_OLD-a9dcdae6a26bd2ba316ca841f6ca026fb3f8b90f.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 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs9
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 }