Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

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
                 }
                 else
                 {
-                    if ((ParentGroup.RootPart.ScriptEvents & scriptEvents.collision_start) != 0)
+                    if ((ParentGroup.RootPart.ScriptEvents & ev) != 0)
                         sendToRoot = true;
                 }
                 if (sendToRoot && ParentGroup.RootPart != this)
@@ -4708,6 +4708,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void aggregateScriptEvents()
         {
+            if (ParentGroup == null || ParentGroup.RootPart == null)
+                return;
+
             AggregateScriptEvents = 0;
 
             // Aggregate script events