From 48890ea3495036978fabb1564c1372ed9c2b375a Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 18 Oct 2008 15:23:29 +0000
Subject: Guard against a null ref that can prevent objects from being
 persisted

---
 OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index f24e6fb..ca62b6d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1163,7 +1163,8 @@ namespace OpenSim.Region.Environment.Scenes
                 ILandObject parcel = m_scene.LandChannel.GetLandObject(
                         m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);
 
-                if (parcel.landData.OtherCleanTime != 0)
+                if (parcel != null && parcel.landData != null &&
+                        parcel.landData.OtherCleanTime != 0)
                 {
                     if (parcel.landData.OwnerID != OwnerID &&
                             (parcel.landData.GroupID != GroupID ||
-- 
cgit v1.1