* 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!)
This commit is contained in:
Teravus Ovares
2008-03-23 07:10:04 +00:00
parent dc850df50a
commit f82227a186
2 changed files with 31 additions and 5 deletions

View File

@@ -763,11 +763,25 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
foreach (SceneObjectGroup obj in primsOverMe)
{
if (!ownersAndCount.ContainsKey(obj.OwnerID))
try
{
ownersAndCount.Add(obj.OwnerID, 0);
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)
{
m_log.Error("[LAND]: Unable to match a prim with it's owner.");
}
ownersAndCount[obj.OwnerID] += obj.PrimCount;
}
if (ownersAndCount.Count > 0)
{