diff options
| author | UbitUmarov | 2012-05-15 01:40:46 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-05-15 01:40:46 +0100 |
| commit | 325973d36f98a4b2fb0291e8bdc0063c4264329d (patch) | |
| tree | 6c87e06e483d9c23ee60302fe974b458d6cd0f6b /OpenSim/Region | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC_OLD-325973d36f98a4b2fb0291e8bdc0063c4264329d.zip opensim-SC_OLD-325973d36f98a4b2fb0291e8bdc0063c4264329d.tar.gz opensim-SC_OLD-325973d36f98a4b2fb0291e8bdc0063c4264329d.tar.bz2 opensim-SC_OLD-325973d36f98a4b2fb0291e8bdc0063c4264329d.tar.xz | |
don't send colision events to volume detectors
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 4884469..81244ef 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2631,7 +2631,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2631 | SendSound(CollisionSound.ToString(), CollisionSoundVolume, true, (byte)0, 0, false, false); | 2631 | SendSound(CollisionSound.ToString(), CollisionSoundVolume, true, (byte)0, 0, false, false); |
| 2632 | 2632 | ||
| 2633 | SendCollisionEvent(scriptEvents.collision_start, startedColliders, ParentGroup.Scene.EventManager.TriggerScriptCollidingStart); | 2633 | SendCollisionEvent(scriptEvents.collision_start, startedColliders, ParentGroup.Scene.EventManager.TriggerScriptCollidingStart); |
| 2634 | SendCollisionEvent(scriptEvents.collision , m_lastColliders , ParentGroup.Scene.EventManager.TriggerScriptColliding); | 2634 | if(!ParentGroup.RootPart.VolumeDetectActive) |
| 2635 | SendCollisionEvent(scriptEvents.collision , m_lastColliders , ParentGroup.Scene.EventManager.TriggerScriptColliding); | ||
| 2635 | SendCollisionEvent(scriptEvents.collision_end , endedColliders , ParentGroup.Scene.EventManager.TriggerScriptCollidingEnd); | 2636 | SendCollisionEvent(scriptEvents.collision_end , endedColliders , ParentGroup.Scene.EventManager.TriggerScriptCollidingEnd); |
| 2636 | 2637 | ||
| 2637 | if (startedColliders.Contains(0)) | 2638 | if (startedColliders.Contains(0)) |