Merge branch 'master' of /home/opensim/var/repo/opensim

2012-05-14 22:33:00 -04:00 · 2012-05-14 22:33:00 -04:00 · baff20f7c5
parent 8e6276865b 069bcd45e5
commit baff20f7c5
1 changed files with 3 additions and 0 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@ -4285,6 +4285,9 @@ namespace OpenSim.Region.Framework.Scenes

        public void aggregateScriptEvents()
        {
+            if (ParentGroup.RootPart == null)
+                return;
+
            AggregateScriptEvents = 0;

            // Aggregate script events