aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index f9c5e28..6064279 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2567,7 +2567,7 @@ namespace OpenSim.Region.Framework.Scenes
2567 } 2567 }
2568 else 2568 else
2569 { 2569 {
2570 if ((ParentGroup.RootPart.ScriptEvents & scriptEvents.collision_start) != 0) 2570 if ((ParentGroup.RootPart.ScriptEvents & ev) != 0)
2571 sendToRoot = true; 2571 sendToRoot = true;
2572 } 2572 }
2573 if (sendToRoot && ParentGroup.RootPart != this) 2573 if (sendToRoot && ParentGroup.RootPart != this)
@@ -4708,6 +4708,9 @@ namespace OpenSim.Region.Framework.Scenes
4708 4708
4709 public void aggregateScriptEvents() 4709 public void aggregateScriptEvents()
4710 { 4710 {
4711 if (ParentGroup == null || ParentGroup.RootPart == null)
4712 return;
4713
4711 AggregateScriptEvents = 0; 4714 AggregateScriptEvents = 0;
4712 4715
4713 // Aggregate script events 4716 // Aggregate script events