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

2012-05-14 22:39:03 -04:00 · 2012-05-14 22:39:03 -04:00 · e9d1af46fa
parent baff20f7c5 ef94c31ef8
commit e9d1af46fa
1 changed files with 1 additions and 1 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@ -4285,7 +4285,7 @@ namespace OpenSim.Region.Framework.Scenes

        public void aggregateScriptEvents()
        {
-            if (ParentGroup.RootPart == null)
+            if (ParentGroup == null || ParentGroup.RootPart == null)
                return;

            AggregateScriptEvents = 0;