aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordahlia2012-05-14 19:34:18 -0700
committerdahlia2012-05-14 19:34:18 -0700
commit1ce576b115c5f735794d2e0fe8f24e00fa9f7614 (patch)
treea38c64c5076d18137c8422e0f1b4d28710041017
parentTry to fix sqlite breakage (diff)
downloadopensim-SC_OLD-1ce576b115c5f735794d2e0fe8f24e00fa9f7614.zip
opensim-SC_OLD-1ce576b115c5f735794d2e0fe8f24e00fa9f7614.tar.gz
opensim-SC_OLD-1ce576b115c5f735794d2e0fe8f24e00fa9f7614.tar.bz2
opensim-SC_OLD-1ce576b115c5f735794d2e0fe8f24e00fa9f7614.tar.xz
Add another null check to Melanie's last commit. Seems to eliminate sqlite errors in log but no idea if it's working properly
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ae8f25d..e3f06f8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4285,7 +4285,7 @@ namespace OpenSim.Region.Framework.Scenes
4285 4285
4286 public void aggregateScriptEvents() 4286 public void aggregateScriptEvents()
4287 { 4287 {
4288 if (ParentGroup.RootPart == null) 4288 if (ParentGroup == null || ParentGroup.RootPart == null)
4289 return; 4289 return;
4290 4290
4291 AggregateScriptEvents = 0; 4291 AggregateScriptEvents = 0;