* Added a little more stability for getting the object list from the parcel box. (previously it crashed my simulator)

* Found and gracefully handled a few situations where null references occur.  (m_rootPart again!)

2 files changed, 31 insertions, 5 deletions

diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
index 1311fd3..68e8fcf 100644
--- a/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
@@ -763,11 +763,25 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
 
             foreach (SceneObjectGroup obj in primsOverMe)
             {
-                if (!ownersAndCount.ContainsKey(obj.OwnerID))
+                try
+                {
+                    if (!ownersAndCount.ContainsKey(obj.OwnerID))
+                    {
+                        ownersAndCount.Add(obj.OwnerID, 0);
+                    }
+                }
+                catch (NullReferenceException)
+                {
+                    m_log.Info("[LAND]: " + "Got Null Reference when searching land owners from the parcel panel");
+                }
+                try
+                {
+                    ownersAndCount[obj.OwnerID] += obj.PrimCount;
+                }
+                catch (KeyNotFoundException)
                 {
-                    ownersAndCount.Add(obj.OwnerID, 0);
+                    m_log.Error("[LAND]: Unable to match a prim with it's owner.");
                 }
-                ownersAndCount[obj.OwnerID] += obj.PrimCount;
             }
             if (ownersAndCount.Count > 0)
             {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 1e63ae7..2875874 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -161,7 +161,14 @@ namespace OpenSim.Region.Environment.Scenes
 
         public override uint LocalId
         {
-            get { return m_rootPart.LocalId; }
+            get {
+                if (m_rootPart == null)
+                {
+                    m_log.Error("[PRIMGROUP]: Unable to find the rootpart for a LocalId Request!");
+                    return 0;
+                }
+ 
+                return m_rootPart.LocalId; }
             set { m_rootPart.LocalId = value; }
         }
 
@@ -173,7 +180,12 @@ namespace OpenSim.Region.Environment.Scenes
 
         public LLUUID OwnerID
         {
-            get { return m_rootPart.OwnerID; }
+            get {
+                if (m_rootPart == null)
+                    return LLUUID.Zero;
+
+                return m_rootPart.OwnerID; 
+            }
             set { m_rootPart.OwnerID = value; }
         }