OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-06-05 04:00:34 +02:00
parent 454445fe6a 170b820a11
commit fd8cb45664
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -2626,14 +2626,24 @@ namespace OpenSim.Region.Framework.Scenes
private void SendLandCollisionEvent(scriptEvents ev, ScriptCollidingNotification notify) private void SendLandCollisionEvent(scriptEvents ev, ScriptCollidingNotification notify)
{ {
if ((ParentGroup.RootPart.ScriptEvents & ev) != 0) bool sendToRoot = true;
{
ColliderArgs LandCollidingMessage = new ColliderArgs(); ColliderArgs LandCollidingMessage = new ColliderArgs();
List<DetectedObject> colliding = new List<DetectedObject>(); List<DetectedObject> colliding = new List<DetectedObject>();
colliding.Add(CreateDetObjectForGround()); colliding.Add(CreateDetObjectForGround());
LandCollidingMessage.Colliders = colliding; LandCollidingMessage.Colliders = colliding;
if (Inventory.ContainsScripts())
{
if (!PassCollisions)
sendToRoot = false;
}
if ((ScriptEvents & ev) != 0)
notify(LocalId, LandCollidingMessage);
if ((ParentGroup.RootPart.ScriptEvents & ev) != 0 && sendToRoot)
{
notify(ParentGroup.RootPart.LocalId, LandCollidingMessage); notify(ParentGroup.RootPart.LocalId, LandCollidingMessage);
} }
} }