From 1ce576b115c5f735794d2e0fe8f24e00fa9f7614 Mon Sep 17 00:00:00 2001
From: dahlia <dahliaTrimble@removeme.gmail.com>
Date: Mon, 14 May 2012 19:34:18 -0700
Subject: [PATCH] Add another null check to Melanie's last commit. Seems to
 eliminate sqlite errors in log but no idea if it's working properly

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ae8f25dc9e..e3f06f8fbc 100644
--- 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;